diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk
index 42474eff5b..fe56fd353c 100644
--- a/target/board/generic_arm64/device.mk
+++ b/target/board/generic_arm64/device.mk
@@ -39,7 +39,4 @@ 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 c82e90a231..d28ace7ab0 100755
--- a/target/board/generic_x86_64/device.mk
+++ b/target/board/generic_x86_64/device.mk
@@ -28,7 +28,4 @@ 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)