Make change and version bump to BP2A.250205.001 (48a7359c) · Commits · e / os / android_build

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)/:/)

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,4 +18,4 @@
		# (like "CRB01"). It must be a single word, and is
		# capitalized by convention.

		BUILD_ID=BP2A.250204.001
		BUILD_ID=BP2A.250205.001

+3 −0

Original line number	Diff line number	Diff line
		@@ -505,6 +505,9 @@ _product_single_value_vars += PRODUCT_ANDROIDMK_ALLOWLIST_FILE
		# kati invocation will not be run.
		_product_single_value_vars += PRODUCT_SOONG_ONLY

		# If set to true, use NOTICE.xml.gz generated by soong
		_product_single_value_vars += PRODUCT_USE_SOONG_NOTICE_XML

		.KATI_READONLY := _product_single_value_vars _product_list_vars
		_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

+2 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,8 @@ $(call add_json_list, TargetFSConfigGen, $(TARGET_FS_CONFIG_GEN)
		$(call add_json_bool, UseSoongSystemImage, $(filter true,$(USE_SOONG_DEFINED_SYSTEM_IMAGE)))
		$(call add_json_str, ProductSoongDefinedSystemImage, $(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE))

		$(call add_json_bool, UseSoongNoticeXML, $(filter true,$(PRODUCT_USE_SOONG_NOTICE_XML)))

		$(call add_json_map, VendorVars)
		$(foreach namespace,$(sort $(SOONG_CONFIG_NAMESPACES)),\
		$(call add_json_map, $(namespace))\

+1 −0