StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2021-09-14 09:09:56 +00:00
committed by Gerrit Code Review
parent 97e0c2831d 4bb4d1fb91
commit a83a19d41e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -2430,6 +2430,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.
ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
ifneq ($(INSTALLED_BOOTIMAGE_TARGET),) 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)),)
@@ -2488,6 +2489,7 @@ bootimage_debug-nodeps: $(MKBOOTIMG) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBTOOL)
endif # TARGET_NO_KERNEL endif # TARGET_NO_KERNEL
endif # INSTALLED_BOOTIMAGE_TARGET endif # INSTALLED_BOOTIMAGE_TARGET
endif # BUILDING_VENDOR_BOOT_IMAGE is not true
ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true) ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
ifeq ($(BUILDING_RAMDISK_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 # 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. # can only be used if the device is unlocked with verification error.
ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
ifneq ($(INSTALLED_BOOTIMAGE_TARGET),) ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)
ifneq ($(strip $(TARGET_NO_KERNEL)),true) 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 # TARGET_NO_KERNEL
endif # INSTALLED_BOOTIMAGE_TARGET endif # INSTALLED_BOOTIMAGE_TARGET
endif # BUILDING_VENDOR_BOOT_IMAGE is not true
endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true
ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true) ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)