From 00fc943377a110e7c31faa49d9deb09a660ffc53 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Thu, 9 Sep 2021 19:04:55 +0800 Subject: [PATCH] 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. (Cherry-picked with Ic032b8594f776f911d7b6345a97d64fed930d890 to solve merge conflict.) Bug: 200945738 Bug: 196001476 Test: make then checks $OUT/*.img Change-Id: If76df0329c96f718ebf0a0ac138cde3ae859a6c6 Merged-In: If76df0329c96f718ebf0a0ac138cde3ae859a6c6 (cherry picked from commit 4bb4d1fb9165b124f67bb6f405503ca4ae1ecef2) --- core/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/Makefile b/core/Makefile index 2d56edb9ee..a10e93d68f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2398,6 +2398,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)),) @@ -2456,6 +2457,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) @@ -2601,6 +2603,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) @@ -2643,6 +2646,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)