aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-04 07:53:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-04 07:53:59 +0000
commit1508e90b9463354227511ea9ddfa7702d6694f75 (patch)
tree9c30bd949ab234c84dec2c0334afb889b04c8685
parent8a59680b4f9e2f908ece6215366aa67a8e71a46d (diff)
parent94ce4dbe2fab34b538a6eb774ca95809e79faf8a (diff)
downloadbuild-1508e90b9463354227511ea9ddfa7702d6694f75.tar.gz
Merge "Stop building boot-debug-*.img for GKI" am: 94ce4dbe2f
Original change: https://android-review.googlesource.com/c/platform/build/+/1839817 Change-Id: Id9f6eba26d02d1326fc6d8afbc318a76a0961a7b
-rw-r--r--target/board/generic_arm64/device.mk3
-rwxr-xr-xtarget/board/generic_x86_64/device.mk3
2 files changed, 6 insertions, 0 deletions
diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk
index 0a05d9c13d..00a046c357 100644
--- a/target/board/generic_arm64/device.mk
+++ b/target/board/generic_arm64/device.mk
@@ -35,4 +35,7 @@ endif
PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false
PRODUCT_BUILD_RECOVERY_IMAGE := false
+# GKI devices should use vendor_boot-debug.img instead.
+PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false
+
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk
index d28ace7ab0..c82e90a231 100755
--- a/target/board/generic_x86_64/device.mk
+++ b/target/board/generic_x86_64/device.mk
@@ -28,4 +28,7 @@ endif
PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false
PRODUCT_BUILD_RECOVERY_IMAGE := false
+# GKI devices should use vendor_boot-debug.img instead.
+PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false
+
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)