commit e1ade023244046d842a6569c51748e81fa94aa81
author Yi-Yo Chiang <yochiang@google.com> Thu Oct 14 09:19:25 2021 +0000
committer Yi-Yo Chiang <yochiang@google.com> Thu Oct 14 10:20:00 2021 +0000
tree 55c02525b294fe0386a8482e988959058fee0d12
parent 0dac1b32e4480dea97420c11efcb6e542a0e4b4a

Revert "Stop building boot-with-debug-*.img for GKI"

This reverts commit 0dac1b32e4480dea97420c11efcb6e542a0e4b4a.

Reason for revert: superseded by
  I3161e42b00a93177a1a4cb3b22da2218d294b7a7

Bug: 202129499
Test: Presubmit
Change-Id: Ib4096cb131b5143d4c82e7bef92b1fbb94a29114

gsi_arm64.mk

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 @@
 # 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

gsi_x86_64.mk

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 @@
 # 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,