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

Commit 855ea21e authored by Gabriele M's avatar Gabriele M Committed by Zhao Wei Liew
Browse files

Always copy bootable images in BOOTABLE_IMAGES/ 

Images placed in BOOTABLE_IMAGES/ are not re-generated when signing
the target-files zip content. As of now, images are put into
BOOTABLE_IMAGES/ only if BOARD_CUSTOM_BOOTIMG is set to true. Remove
the flag and copy the images unconditionally since there's no need
to re-generate them now that ro.bootimage.build.fingerprint is inside
the build.prop.

Change-Id: Idbb5329e0598c04c39fe7f1899b6af3dbdd4f0aa
(cherry picked from commit e4f45007)
parent 65446290

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1994,10 +1994,10 @@ 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/

ifeq ($(BOARD_USES_FULL_RECOVERY_IMAGE),true)

	$(hide) $(ACP) $(INSTALLED_RECOVERYIMAGE_TARGET) $(zip_root)/BOOTABLE_IMAGES/

endif

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE