diff options
author | Hsin-Yi Chen <hsinyichen@google.com> | 2021-05-08 20:53:33 +0800 |
---|---|---|
committer | Hsin-Yi Chen <hsinyichen@google.com> | 2021-05-19 16:47:54 +0800 |
commit | 033d50e2298811d81de7db8cdea63e349a96c9ba (patch) | |
tree | db6b1ef26720320819cacfdc0e4aa5d2e962961f | |
parent | 459b0b867657d689db1f373f2581b789af73dd4f (diff) | |
download | common-033d50e2298811d81de7db8cdea63e349a96c9ba.tar.gz |
Add GKI to gsi_x86_64 buildandroid-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: Ie48a32e87df0ac6518f376e08957b6c11faddee4
Merged-In: Ie48a32e87df0ac6518f376e08957b6c11faddee4
(cherry picked from commit 0f87b5dc1dfd45995a73436362f6315ed6e95bd8)
-rw-r--r-- | gsi_x86_64.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk index eb5bd97..da7e093 100644 --- a/gsi_x86_64.mk +++ b/gsi_x86_64.mk @@ -34,6 +34,11 @@ $(call inherit-product, device/generic/common/gsi_system_ext.mk) $(call inherit-product, device/generic/common/gsi_product.mk) # +# All components inherited here go to boot image +# +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) + +# # Special settings to skip mount product and system_ext on the device, # so this product can be tested isolated from those partitions. # |