commit f3d4f2f26b208126bc5843e0acaf413618bf94ec
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 13 20:59:42 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 13 20:59:42 2020 +0000
tree 75b0da33896fdd09abeee5cf3f360bc9488b0fba
parent 11625369363b339f5fb2d2062798cf5b9c997b89
parent af670812184d212fba072efb8a15cacbdf5a11a3

Merge "Builds boot-debug.img if INSTALLED_BOOTIMAGE_TARGET."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 110d898..26f11a4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2104,7 +2104,7 @@
 #
 # Note: it's intentional to skip signing for boot-debug.img, because it
 # can only be used if the device is unlocked with verification error.
-ifdef BUILDING_BOOT_IMAGE
+ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)
 ifneq ($(strip $(TARGET_NO_KERNEL)),true)
 ifneq ($(strip $(BOARD_KERNEL_BINARIES)),)
   INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,boot-debug,$(BOARD_KERNEL_BINARIES)), \
@@ -2159,7 +2159,7 @@
 	$(foreach b,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(call build-debug-bootimage-target,$b))
 
 endif # TARGET_NO_KERNEL
-endif # BUILDING_BOOT_IMAGE
+endif # INSTALLED_BOOTIMAGE_TARGET
 
 ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
 ifeq ($(BUILDING_RAMDISK_IMAGE),true)