Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e5d8c86 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Builds boot-debug.img if INSTALLED_BOOTIMAGE_TARGET." am: f3d4f2f2 

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

Change-Id: Ie6a0418554a8e2e15a9e58afa2094ea0d7421b07
parents 6bb786a3 f3d4f2f2

core/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -2104,7 +2104,7 @@ endif # BUILDING_RAMDISK_IMAGE 
#

#

# Note: it's intentional to skip signing for boot-debug.img, because it

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

# 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 $(TARGET_NO_KERNEL)),true)

ifneq ($(strip $(BOARD_KERNEL_BINARIES)),)

ifneq ($(strip $(BOARD_KERNEL_BINARIES)),)

  INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,boot-debug,$(BOARD_KERNEL_BINARIES)), \

  INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,boot-debug,$(BOARD_KERNEL_BINARIES)), \
@@ -2159,7 +2159,7 @@ bootimage_debug-nodeps: $(MKBOOTIMG) 
	$(foreach b,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(call build-debug-bootimage-target,$b))

	$(foreach b,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(call build-debug-bootimage-target,$b))





endif # TARGET_NO_KERNEL

endif # TARGET_NO_KERNEL

endif # BUILDING_BOOT_IMAGE

endif # INSTALLED_BOOTIMAGE_TARGET





ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)

ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)

ifeq ($(BUILDING_RAMDISK_IMAGE),true)

ifeq ($(BUILDING_RAMDISK_IMAGE),true)