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

Commit ae6f7636 authored by Bartłomiej Grzesik's avatar Bartłomiej Grzesik Committed by Automerger Merge Worker
Browse files

Merge "Temporarily enable use pvmfw prebuilts as fallback" into main am: 6c7d1339 am: f9266e46 

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



Change-Id: I9b7138803852c55c43c262dd3c7918fa0d5e4125
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c59be16 f9266e46

core/Makefile

+19 −0
Original line number Diff line number Diff line
@@ -4464,6 +4464,25 @@ INTERNAL_PVMFWIMAGE_FILES := $(call module-target-built-files,pvmfw_img) 
INTERNAL_PVMFW_EMBEDDED_AVBKEY := $(call module-target-built-files,pvmfw_embedded_key_pub_bin)

INTERNAL_PVMFW_SYMBOL := $(TARGET_OUT_EXECUTABLES_UNSTRIPPED)/pvmfw



# If pvmfw target is not available and there is a prebuilt available use prebuilt

# NOTE: This is only a temporary feature for x86_64 and is not meant to be supported for long.

# TODO(b/391333413): Don't allow use of pvmfw prebuilts as soon as it is possible

ifeq ($(INTERNAL_PVMFWIMAGE_FILES),)

ifneq ($(PRODUCT_PVMFW_IMAGE_PREBUILT),)

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

INTERNAL_PVMFW_SYMBOL :=



ifneq ($(PRODUCT_PVMFW_BIN_PREBUILT),)

INSTALLED_PVMFW_BINARY_TARGET := $(call module-target-built-files,$(PRODUCT_PVMFW_BIN_PREBUILT))

endif # PRODUCT_PVMFW_BIN_PREBUILT



ifneq ($(PRODUCT_PVMFW_EMBEDDED_AVBKEY_PREBUILT),)

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

endif # PRODUCT_PVMFW_EMBEDDED_AVBKEY_PREBUILT



endif # PRODUCT_PVMFW_IMAGE_PREBUILT

endif # INTERNAL_PVMFWIMAGE_FILES



$(call declare-1p-container,$(INSTALLED_PVMFWIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_PVMFWIMAGE_TARGET),$(INTERNAL_PVMFWIMAGE_FILES),$(PRODUCT_OUT)/:/)