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

Commit 8cee2c14 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "target_files: Package pvmfw.bin under PVMFW/" am: 056f6b2d am: d2fe2730 am: 4fba6442 

Original change: https://android-review.googlesource.com/c/platform/build/+/2238519



Change-Id: I9653a5f1f52fe0cd3b1e684a3c4220c06c481de6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a09c9406 4fba6442

core/Makefile

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




INSTALLED_PVMFWIMAGE_TARGET := $(PRODUCT_OUT)/pvmfw.img

INSTALLED_PVMFWIMAGE_TARGET := $(PRODUCT_OUT)/pvmfw.img

INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET := $(PRODUCT_OUT)/pvmfw_embedded.avbpubkey

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_PVMFWIMAGE_FILES := $(call module-target-built-files,pvmfw_img)

INTERNAL_PVMFW_EMBEDDED_AVBKEY := $(call module-target-built-files,pvmfw_embedded_key)

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

	    $(INSTALLED_CACHEIMAGE_TARGET) \

	    $(INSTALLED_DTBOIMAGE_TARGET) \

	    $(INSTALLED_DTBOIMAGE_TARGET) \

	    $(INSTALLED_PVMFWIMAGE_TARGET) \

	    $(INSTALLED_PVMFWIMAGE_TARGET) \

	    $(INSTALLED_PVMFW_BINARY_TARGET) \

	    $(INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET) \

	    $(INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET) \

	    $(INSTALLED_CUSTOMIMAGES_TARGET) \

	    $(INSTALLED_CUSTOMIMAGES_TARGET) \

	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

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

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

	$(hide) cp $(INSTALLED_PVMFWIMAGE_TARGET) $(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) 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

endif

ifdef BOARD_PREBUILT_BOOTLOADER

ifdef BOARD_PREBUILT_BOOTLOADER

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

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