diff options
| author | Yi-Yo Chiang <yochiang@google.com> | 2021-10-21 07:36:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-21 07:36:50 +0000 |
| commit | 6c51e32ec0e5eba14b0837d1c9f102872a4e6e6e (patch) | |
| tree | 36990ffafe690860ff1b0cfeae18376d41d59ae1 | |
| parent | 0281d2dda9b9a306ede30914a3e92572e4e57730 (diff) | |
| parent | 52103ef144645ccaa98b0e69e775a80027dbcdf4 (diff) | |
| download | common-6c51e32ec0e5eba14b0837d1c9f102872a4e6e6e.tar.gz | |
Merge "Revert "Stop building boot-with-debug-*.img for GKI"" am: 52103ef144
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1856261
Change-Id: I4e244e1b62647ed811cf4908c7fab2a4bc096ca3
| -rw-r--r-- | gsi_arm64.mk | 5 | ||||
| -rw-r--r-- | gsi_x86_64.mk | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/gsi_arm64.mk b/gsi_arm64.mk index 066c515..53c8300 100644 --- a/gsi_arm64.mk +++ b/gsi_arm64.mk @@ -44,11 +44,6 @@ $(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_arm64/device.mk) -ifeq ($(TARGET_PRODUCT),gsi_arm64) - # GKI devices should use vendor_boot-debug.img from device build instead. - PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false - PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE := false -endif # # Special settings for GSI releasing diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk index 5f74c55..da7e093 100644 --- a/gsi_x86_64.mk +++ b/gsi_x86_64.mk @@ -37,11 +37,6 @@ $(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) -ifeq ($(TARGET_PRODUCT),gsi_x86_64) - # GKI devices should use vendor_boot-debug.img from device build instead. - PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false - PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE := false -endif # # Special settings to skip mount product and system_ext on the device, |