Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22913dea authored by Brint E. Kriebel's avatar Brint E. Kriebel Committed by Chirayu Desai
Browse files

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
parent fbe6ef29

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -1508,6 +1508,12 @@ endif 
	@# 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, \