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

core/Makefile

+16 −16

Original line number	Original line	Diff line number	Diff line
	@@ -7282,22 +7282,10 @@ ifeq (true,$(EMMA_INSTRUMENT))
	# to be instrumented.		# to be instrumented.
	# Any dependencies are set up later in build/make/core/main.mk.		# Any dependencies are set up later in build/make/core/main.mk.

	JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar
	$(JACOCO_REPORT_CLASSES_ALL): PRIVATE_TARGET_JACOCO_DIR := $(call intermediates-dir-for,PACKAGING,jacoco)
	$(JACOCO_REPORT_CLASSES_ALL): PRIVATE_HOST_JACOCO_DIR := $(call intermediates-dir-for,PACKAGING,jacoco,HOST)
	$(JACOCO_REPORT_CLASSES_ALL): PRIVATE_TARGET_PROGUARD_USAGE_DIR := $(call intermediates-dir-for,PACKAGING,proguard_usage)
	$(JACOCO_REPORT_CLASSES_ALL): PRIVATE_HOST_PROGUARD_USAGE_DIR := $(call intermediates-dir-for,PACKAGING,proguard_usage,HOST)
	$(JACOCO_REPORT_CLASSES_ALL) :
	@echo "Collecting uninstrumented classes"
	mkdir -p $(PRIVATE_TARGET_JACOCO_DIR) $(PRIVATE_HOST_JACOCO_DIR) $(PRIVATE_TARGET_PROGUARD_USAGE_DIR) $(PRIVATE_HOST_PROGUARD_USAGE_DIR)
	$(SOONG_ZIP) -o $@ -L 0 \
	-C $(PRIVATE_TARGET_JACOCO_DIR) -P out/target/common/obj -D $(PRIVATE_TARGET_JACOCO_DIR) \
	-C $(PRIVATE_HOST_JACOCO_DIR) -P out/target/common/obj -D $(PRIVATE_HOST_JACOCO_DIR) \
	-C $(PRIVATE_TARGET_PROGUARD_USAGE_DIR) -P out/target/common/obj -D $(PRIVATE_TARGET_PROGUARD_USAGE_DIR) \
	-C $(PRIVATE_HOST_PROGUARD_USAGE_DIR) -P out/target/common/obj -D $(PRIVATE_HOST_PROGUARD_USAGE_DIR)

	ifeq (,$(TARGET_BUILD_UNBUNDLED))		ifeq (,$(TARGET_BUILD_UNBUNDLED))
	$(JACOCO_REPORT_CLASSES_ALL): $(INTERNAL_ALLIMAGES_FILES)		_jacoco_modules := $(call product-installed-modules,$(INTERNAL_PRODUCT))
			else
			_jacoco_modules := $(unbundled_build_modules)
	endif		endif

	# This is not ideal, but it is difficult to correctly figure out the actual jacoco report		# This is not ideal, but it is difficult to correctly figure out the actual jacoco report
	@@ -7305,8 +7293,20 @@ endif
	# the env variable is set and this should guarantee thaat all the jacoco report jars are ready		# the env variable is set and this should guarantee thaat all the jacoco report jars are ready
	# when we package the final report jar here.		# when we package the final report jar here.
	ifeq ($(JACOCO_PACKAGING_INCLUDE_DEVICE_TESTS),true)		ifeq ($(JACOCO_PACKAGING_INCLUDE_DEVICE_TESTS),true)
	$(JACOCO_REPORT_CLASSES_ALL): $(COMPATIBILITY.device-tests.FILES)		_jacoco_modules += $(COMPATIBILITY.device-tests.MODULES)
	endif		endif

			JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar
			$(JACOCO_REPORT_CLASSES_ALL): PRIVATE_SOONG_ZIP_ARGUMENTS := $(foreach m,$(_jacoco_modules),$(ALL_MODULES.$(m).JACOCO_REPORT_SOONG_ZIP_ARGUMENTS))
			$(JACOCO_REPORT_CLASSES_ALL): $(SOONG_ZIP) $(foreach m,$(_jacoco_modules),$(ALL_MODULES.$(m).JACOCO_REPORT_FILES))
			@echo "Collecting uninstrumented classes"
			rm -f $@.tmparglist && touch $@.tmparglist
			$(foreach arg,$(PRIVATE_SOONG_ZIP_ARGUMENTS),printf "%s\n" "$(arg)" >> $@.tmparglist$(newline))
			$(SOONG_ZIP) -o $@ -L 0 @$@.tmparglist
			rm -f $@.tmparglist

			_jacoco_modules :=

	endif # EMMA_INSTRUMENT=true		endif # EMMA_INSTRUMENT=true

core/build_id.mk

+1 −1

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

	BUILD_ID=BP3A.250508.001		BUILD_ID=BP3A.250509.001

core/jacoco.mk

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -72,11 +72,10 @@ $(my_classes_to_report_on_path): $(my_unzipped_timestamp_path)
	zip -q $@ \		zip -q $@ \
	-r $(PRIVATE_UNZIPPED_PATH)		-r $(PRIVATE_UNZIPPED_PATH)

	# Make a rule to copy the jacoco-report-classes.jar to a packaging directory.		ALL_MODULES.$(my_register_name).JACOCO_REPORT_FILES := $(my_classes_to_report_on_path)
	$(eval $(call copy-one-file,$(my_classes_to_report_on_path),\		ALL_MODULES.$(my_register_name).JACOCO_REPORT_SOONG_ZIP_ARGUMENTS := \
	$(call local-packaging-dir,jacoco)/jacoco-report-classes.jar))		-e out/target/common/obj/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates/jacoco-report-classes.jar \
	$(call add-dependency,$(LOCAL_BUILT_MODULE),\		-f $(my_classes_to_report_on_path)
	$(call local-packaging-dir,jacoco)/jacoco-report-classes.jar)

	# make a task that invokes instrumentation		# make a task that invokes instrumentation
	my_instrumented_path := $(my_files)/work/instrumented/classes		my_instrumented_path := $(my_files)/work/instrumented/classes

core/soong_app_prebuilt.mk

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -85,10 +85,10 @@ else
	endif		endif

	ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR		ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
	$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\		ALL_MODULES.$(my_register_name).JACOCO_REPORT_FILES := $(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR)
	$(call local-packaging-dir,jacoco)/jacoco-report-classes.jar))		ALL_MODULES.$(my_register_name).JACOCO_REPORT_SOONG_ZIP_ARGUMENTS := \
	$(call add-dependency,$(LOCAL_BUILT_MODULE),\		-e out/target/common/obj/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates/jacoco-report-classes.jar \
	$(call local-packaging-dir,jacoco)/jacoco-report-classes.jar)		-f $(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR)
	endif		endif

	ifdef LOCAL_SOONG_PROGUARD_DICT		ifdef LOCAL_SOONG_PROGUARD_DICT

core/soong_java_prebuilt.mk

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -42,10 +42,10 @@ endif
	$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))		$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))

	ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR		ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
	$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\		ALL_MODULES.$(my_register_name).JACOCO_REPORT_FILES := $(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR)
	$(call local-packaging-dir,jacoco)/jacoco-report-classes.jar))		ALL_MODULES.$(my_register_name).JACOCO_REPORT_SOONG_ZIP_ARGUMENTS := \
	$(call add-dependency,$(common_javalib.jar),\		-e out/target/common/obj/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates/jacoco-report-classes.jar \
	$(call local-packaging-dir,jacoco)/jacoco-report-classes.jar)		-f $(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR)
	endif		endif

	ifdef LOCAL_SOONG_PROGUARD_DICT		ifdef LOCAL_SOONG_PROGUARD_DICT