Merge "Skip building boot-(test-harness|debug).img if not needed" (a83a19d4) · Commits · e / os / android_build

core/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -2430,6 +2430,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)),)
		@@ -2488,6 +2489,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)
		@@ -2633,6 +2635,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)

		@@ -2675,6 +2678,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)