build: Handle custom boot images properly

When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.

Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0
Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad

diff --git a/core/Makefile b/core/Makefile
index ff65704..5967d99 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -1871,6 +1871,12 @@ endif # BOARD_USES_RECOVERY_AS_BOOT
        @# Contents of the data image
        $(hide) $(call package_files-copy-root, \
                $(TARGET_OUT_DATA),$(zip_root)/DATA)
+ifdef BOARD_CUSTOM_BOOTIMG
+       @# Prebuilt boot images
+       $(hide) mkdir -p $(zip_root)/BOOTABLE_IMAGES
+       $(hide) $(ACP) $(INSTALLED_BOOTIMAGE_TARGET) $(zip_root)/BOOTABLE_IMAGES/
+       $(hide) $(ACP) $(INSTALLED_RECOVERYIMAGE_TARGET) $(zip_root)/BOOTABLE_IMAGES/
+endif
 ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE
        @# Contents of the vendor image
        $(hide) $(call package_files-copy-root, \