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

Commit 03975ed7 authored by Pierre-Clément Tosi's avatar Pierre-Clément Tosi
Browse files

target_files: Package pvmfw.bin under PVMFW/ 

Add the pvmfw.bin binary to the target_files archive to bring back
ATC-based change detection for pvmfw (which compares the content of
PVMFW/ between builds) and therefore bring back our TreeHugger
pre-submit tests for it. Those were introduced in c7b83787 ("Create
$(zip_root)/PVMFW & archive prebuilt used") but inadvertently removed
in d0000048 ("core: Get pmvfw.img partition from Soong").

Bug: 261393794
Test: m target-files-package
Change-Id: I0141d59154b54641cb348af3b98fe12624d5939e
parent dd026fce

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -3930,6 +3930,7 @@ pvmfwimage: $(INSTALLED_PVMFWIMAGE_TARGET) 


INSTALLED_PVMFWIMAGE_TARGET := $(PRODUCT_OUT)/pvmfw.img

INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET := $(PRODUCT_OUT)/pvmfw_embedded.avbpubkey

INSTALLED_PVMFW_BINARY_TARGET := $(call module-installed-files,pvmfw_bin)

INTERNAL_PVMFWIMAGE_FILES := $(call module-target-built-files,pvmfw_img)

INTERNAL_PVMFW_EMBEDDED_AVBKEY := $(call module-target-built-files,pvmfw_embedded_key)
@@ -5628,6 +5629,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(INSTALLED_CACHEIMAGE_TARGET) \

	    $(INSTALLED_DTBOIMAGE_TARGET) \

	    $(INSTALLED_PVMFWIMAGE_TARGET) \

	    $(INSTALLED_PVMFW_BINARY_TARGET) \

	    $(INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET) \

	    $(INSTALLED_CUSTOMIMAGES_TARGET) \

	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
@@ -5978,6 +5980,8 @@ ifeq ($(BOARD_USES_PVMFWIMAGE),true) 
	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(INSTALLED_PVMFWIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/

	$(hide) cp $(INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET) $(zip_root)/PREBUILT_IMAGES/

	$(hide) mkdir -p $(zip_root)/PVMFW

	$(hide) cp $(INSTALLED_PVMFW_BINARY_TARGET) $(zip_root)/PVMFW/

endif

ifdef BOARD_PREBUILT_BOOTLOADER

	$(hide) mkdir -p $(zip_root)/IMAGES