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

Commit 4bb4d1fb authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

Skip building boot-(test-harness|debug).img if not needed 

boot-(test-harness|debug).img is not needed for devices with
a /vendor_boot partition. They can use vendor_boot-(test-harness|debug).img
instead.

Bug: 196001476
Test: make then checks $OUT/*.img
Change-Id: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
parent 799e26e6

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -2409,6 +2409,7 @@ endif # BUILDING_RAMDISK_IMAGE 
#

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

ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true)

ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)

ifneq ($(strip $(TARGET_NO_KERNEL)),true)

ifneq ($(strip $(BOARD_KERNEL_BINARIES)),)
@@ -2467,6 +2468,7 @@ bootimage_debug-nodeps: $(MKBOOTIMG) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBTOOL) 


endif # TARGET_NO_KERNEL

endif # INSTALLED_BOOTIMAGE_TARGET

endif # BUILDING_VENDOR_BOOT_IMAGE is not true



ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)

ifeq ($(BUILDING_RAMDISK_IMAGE),true)
@@ -2612,6 +2614,7 @@ endif # BUILDING_RAMDISK_IMAGE 
#

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

# can only be used if the device is unlocked with verification error.

ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true)

ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)

ifneq ($(strip $(TARGET_NO_KERNEL)),true)
@@ -2654,6 +2657,7 @@ bootimage_test_harness-nodeps: $(MKBOOTIMG) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBT 


endif # TARGET_NO_KERNEL

endif # INSTALLED_BOOTIMAGE_TARGET

endif # BUILDING_VENDOR_BOOT_IMAGE is not true

endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true



ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)