Make change and version bump to BP2A.250221.001 (f94f1a0b) · Commits · e / os / android_build

core/Makefile

+13 −4

Original line number	Diff line number	Diff line
		@@ -768,10 +768,7 @@ endif
		# $5 partition tag
		# $6 output file
		define _apkcerts_write_line
		$(hide) echo -n 'name="$(1).apk" certificate="$2" private_key="$3"' >> $6
		$(if $(4), $(hide) echo -n ' compressed="$4"' >> $6)
		$(if $(5), $(hide) echo -n ' partition="$5"' >> $6)
		$(hide) echo '' >> $6
		$(hide) echo 'name="$(1).apk" certificate="$2" private_key="$3"$(if $(4), compressed="$4")$(if $(5), partition="$5")' >> $6

		endef

		@@ -7975,6 +7972,18 @@ IMAGES := $(INSTALLED_BOOTIMAGE_TARGET) \
		$(INSTALLED_VBMETAIMAGE_TARGET) \
		$(INSTALLED_USERDATAIMAGE_TARGET)

		# -----------------------------------------------------------------
		# Desktop generated firmware filesystem.
		TARGET_PRODUCT_FW_IMAGE_PACKAGE := prebuilt-$(TARGET_PRODUCT)-firmware-image
		GENERATED_FW_IMAGE := $(PRODUCT_OUT)/product/etc/$(TARGET_PRODUCT)-firmware.img

		generated_fw_image_found := $(strip $(foreach pp,$(PRODUCT_PACKAGES),\
		$(if $(findstring $(TARGET_PRODUCT_FW_IMAGE_PACKAGE),$(pp)),$(pp))))

		ifneq (,$(generated_fw_image_found))
		$(call dist-for-goals,dist_files,$(GENERATED_FW_IMAGE))
		endif

		# -----------------------------------------------------------------
		# Desktop pack image hook.
		ifneq (,$(strip $(PACK_DESKTOP_FILESYSTEM_IMAGES)))

+5 −0

Original line number	Diff line number	Diff line
		@@ -341,3 +341,8 @@ endif
		# Variables for extra branches
		# TODO(b/383238397): Use bootstrap_go_package to enable extra flags.
		-include vendor/google/build/extra_soong_config_vars.mk

		# Variable for CI test packages
		ifneq ($(filter arm x86 true,$(TARGET_ARCH) $(TARGET_2ND_ARCH) $(TARGET_ENABLE_MEDIADRM_64)),)
		$(call soong_config_set_bool,ci_tests,uses_widevine_tests, true)
		endif

+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.250220.001
		BUILD_ID=BP2A.250221.001

+3 −0

Original line number	Diff line number	Diff line
		@@ -8,3 +8,6 @@ per-file developer_gsi_keys.mk = file:/target/product/gsi/OWNERS
		per-file go_defaults.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com
		per-file go_defaults_512.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com
		per-file go_defaults_common.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com

		# Translation
		per-file languages_default.mk = aapple@google.com