Merge "Revert "Stop building boot-debug-*.img for GKI"" am: 8681e5ac2a am: 93152fc87a am: b6e0edf835

Original change: https://android-review.googlesource.com/c/platform/build/+/1845113

Change-Id: I48004dbf332c3aaf79ce89048ded366f68870de5
diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk
index 00a046c..0a05d9c 100644
--- a/target/board/generic_arm64/device.mk
+++ b/target/board/generic_arm64/device.mk
@@ -35,7 +35,4 @@
 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 c82e90a..d28ace7 100755
--- a/target/board/generic_x86_64/device.mk
+++ b/target/board/generic_x86_64/device.mk
@@ -28,7 +28,4 @@
 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)