Make change and version bump to BP3A.250506.001 (ed89dfe5) · Commits · e / os / android_build

core/Makefile

+5 −27

Original line number	Diff line number	Diff line
		@@ -7318,14 +7318,12 @@ endif # EMMA_INSTRUMENT=true
		# finding the appropriate dictionary to deobfuscate a stack trace frame.
		#

		# The proguard zips for unbundled builds are built with soong
		ifeq (,$(TARGET_BUILD_UNBUNDLED))

		_proguard_dict_zip_modules := $(call product-installed-modules,$(INTERNAL_PRODUCT))
		else
		_proguard_dict_zip_modules := $(unbundled_build_modules)
		endif

		# Filter out list to avoid uncessary proguard related file generation
		ifeq (,$(TARGET_BUILD_UNBUNDLED))
		filter_out_proguard_dict_zip_modules :=
		# product.img
		ifndef BUILDING_PRODUCT_IMAGE
		@@ -7388,7 +7386,6 @@ endef

		# Filter out proguard dict zip modules those are not installed at the built image
		_proguard_dict_zip_modules := $(foreach m,$(_proguard_dict_zip_modules),$(strip $(call filter-out-proguard-modules,$(m))))
		endif

		# The path to the zip file containing proguard dictionaries.
		PROGUARD_DICT_ZIP :=$= $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict.zip
		@@ -7452,6 +7449,8 @@ $(call declare-container-license-deps,$(PROGUARD_USAGE_ZIP),$(INSTALLED_SYSTEMIM
		$(updater_dep),$(PROGUARD_USAGE_ZIP):/)
		endif

		endif # ifeq (,$(TARGET_BUILD_UNBUNDLED))

		ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))

		# Dump variables used by build_super_image.py (for building super.img and super_empty.img).
		@@ -7937,27 +7936,6 @@ ifneq ($(sdk_repo_goal),)
		include $(TOPDIR)development/build/tools/sdk_repo.mk
		endif

		# -----------------------------------------------------------------
		# The rule to build all fuzz targets for C++ and Rust, and package them.
		# Note: The packages are created in Soong, and in a perfect world,
		# we'd be able to create the phony rule there. But, if we want to
		# have dist goals for the fuzz target, we need to have the PHONY
		# target defined in make. MakeVarsContext.DistForGoal doesn't take
		# into account that a PHONY rule create by Soong won't be available
		# during make, and such will fail with `writing to readonly
		# directory`, because kati will see 'haiku' as being a file, not a
		# phony target.
		.PHONY: haiku
		haiku: $(SOONG_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_FUZZ_TARGETS)
		$(call dist-for-goals,haiku,$(SOONG_FUZZ_PACKAGING_ARCH_MODULES))
		$(call dist-for-goals,haiku,$(PRODUCT_OUT)/module-info.json)
		.PHONY: haiku-java
		haiku-java: $(SOONG_JAVA_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_JAVA_FUZZ_TARGETS)
		$(call dist-for-goals,haiku-java,$(SOONG_JAVA_FUZZ_PACKAGING_ARCH_MODULES))
		.PHONY: haiku-presubmit
		haiku-presubmit: $(SOONG_PRESUBMIT_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_PRESUBMIT_FUZZ_TARGETS)
		$(call dist-for-goals,haiku-presubmit,$(SOONG_PRESUBMIT_FUZZ_PACKAGING_ARCH_MODULES))

		# -----------------------------------------------------------------
		# Extract additional data files used in Layoutlib
		include $(BUILD_SYSTEM)/layoutlib_data.mk

core/build_id.mk

+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=BP3A.250505.002
		BUILD_ID=BP3A.250506.001

core/clear_vars.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -98,7 +98,6 @@ LOCAL_FULL_MANIFEST_FILE:=
		LOCAL_FULL_TEST_CONFIG:=
		LOCAL_FULL_VINTF_FRAGMENTS:=
		LOCAL_FUZZ_ENGINE:=
		LOCAL_FUZZ_INSTALLED_SHARED_DEPS:=
		LOCAL_GCNO_FILES:=
		LOCAL_GENERATED_SOURCES:=
		# Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking.
		@@ -265,7 +264,6 @@ LOCAL_SOONG_INSTALLED_MODULE :=
		LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
		LOCAL_SOONG_LICENSE_METADATA :=
		LOCAL_SOONG_LINK_TYPE :=
		LOCAL_SOONG_LINT_REPORTS :=
		LOCAL_SOONG_LOGTAGS_FILES :=
		LOCAL_SOONG_MODULE_INFO_JSON :=
		LOCAL_SOONG_MODULE_TYPE :=

core/main.mk

+0 −16

Original line number	Diff line number	Diff line
		@@ -1467,14 +1467,6 @@ else ifneq ($(TARGET_BUILD_APPS),)
		$(if $(ALL_MODULES.$(m).BUNDLE),$(ALL_MODULES.$(m).BUNDLE):$(m)-base.zip))
		$(call dist-for-goals,apps_only, $(apps_only_bundle_files))

		# Dist the lint reports if they exist.
		apps_only_lint_report_files := $(foreach m,$(unbundled_build_modules),\
		$(foreach report,$(ALL_MODULES.$(m).LINT_REPORTS),\
		$(report):$(m)-$(notdir $(report))))
		.PHONY: lint-check
		lint-check: $(foreach f, $(apps_only_lint_report_files), $(call word-colon,1,$(f)))
		$(call dist-for-goals,lint-check, $(apps_only_lint_report_files))

		# For uninstallable modules such as static Java library, we have to dist the built file,
		# as <module_name>.<suffix>
		apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\
		@@ -1488,14 +1480,6 @@ else ifneq ($(TARGET_BUILD_APPS),)
		$(call dist-for-goals,apps_only, $(JACOCO_REPORT_CLASSES_ALL))
		endif

		$(PROGUARD_DICT_ZIP) : $(apps_only_installed_files)
		$(call dist-for-goals-with-filenametag,apps_only, $(PROGUARD_DICT_ZIP) $(PROGUARD_DICT_ZIP) $(PROGUARD_DICT_MAPPING))
		$(call declare-container-license-deps,$(PROGUARD_DICT_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)

		$(PROGUARD_USAGE_ZIP) : $(apps_only_installed_files)
		$(call dist-for-goals-with-filenametag,apps_only, $(PROGUARD_USAGE_ZIP))
		$(call declare-container-license-deps,$(PROGUARD_USAGE_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)

		# some more files are disted in soong's unbundled_builder module

		apps_only: $(unbundled_build_modules)

core/soong_app_prebuilt.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -207,10 +207,6 @@ ifdef LOCAL_SOONG_BUNDLE
		ALL_MODULES.$(my_register_name).BUNDLE := $(LOCAL_SOONG_BUNDLE)
		endif

		ifdef LOCAL_SOONG_LINT_REPORTS
		ALL_MODULES.$(my_register_name).LINT_REPORTS := $(LOCAL_SOONG_LINT_REPORTS)
		endif

		ifndef LOCAL_IS_HOST_MODULE
		ifeq ($(LOCAL_SDK_VERSION),system_current)
		my_link_type := java:system