Merge "Builds boot-test-harness.img, if INSTALLED_BOOTIMAGE_TARGET."

This commit is contained in:
Treehugger Robot 2021-04-07 02:05:36 +00:00 committed by Gerrit Code Review
commit d641585484

View file

@ -2542,6 +2542,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 ($(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)),)
@ -2582,6 +2583,7 @@ bootimage_test_harness-nodeps: $(MKBOOTIMG) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBT
$(foreach b,$(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET),$(call build-boot-test-harness-target,$b)) $(foreach b,$(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET),$(call build-boot-test-harness-target,$b))
endif # TARGET_NO_KERNEL endif # TARGET_NO_KERNEL
endif # INSTALLED_BOOTIMAGE_TARGET
endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true
# Creates a compatibility symlink between two partitions, e.g. /system/vendor to /vendor # Creates a compatibility symlink between two partitions, e.g. /system/vendor to /vendor