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

core/Makefile

+0 −41

Original line number	Diff line number	Diff line
		@@ -7268,47 +7268,6 @@ endif

		_symbols_zip_modules_symbols_files :=
		_symbols_zip_modules_mapping_files :=
		# -----------------------------------------------------------------
		# A zip of the coverage directory.
		#
		name := gcov-report-files-all
		ifeq ($(TARGET_BUILD_TYPE),debug)
		name := $(name)_debug
		endif
		COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip
		ifeq (,$(TARGET_BUILD_UNBUNDLED))
		$(COVERAGE_ZIP): $(INTERNAL_ALLIMAGES_FILES)
		endif
		$(COVERAGE_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,coverage)/filelist
		$(COVERAGE_ZIP): $(SOONG_ZIP)
		@echo "Package coverage: $@"
		$(hide) rm -rf $@ $(PRIVATE_LIST_FILE)
		$(hide) mkdir -p $(dir $@) $(TARGET_OUT_COVERAGE) $(dir $(PRIVATE_LIST_FILE))
		$(hide) find $(TARGET_OUT_COVERAGE) \| sort >$(PRIVATE_LIST_FILE)
		$(hide) $(SOONG_ZIP) -d -o $@ -C $(TARGET_OUT_COVERAGE) -l $(PRIVATE_LIST_FILE)

		$(call declare-1p-container,$(COVERAGE_ZIP),)
		ifeq (,$(TARGET_BUILD_UNBUNDLED))
		$(call declare-container-license-deps,$(COVERAGE_ZIP),$(INTERNAL_ALLIMAGE_FILES),$(PRODUCT_OUT)/:/)
		endif

		SYSTEM_NOTICE_DEPS += $(COVERAGE_ZIP)

		#------------------------------------------------------------------
		# Export the LLVM profile data tool and dependencies for Clang coverage processing
		#
		ifeq (true,$(CLANG_COVERAGE))
		LLVM_PROFDATA := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/bin/llvm-profdata
		LLVM_COV := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/bin/llvm-cov
		LIBCXX := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/lib/x86_64-unknown-linux-gnu/libc++.so
		# Use llvm-profdata.zip for backwards compatibility with tradefed code.
		LLVM_COVERAGE_TOOLS_ZIP := $(PRODUCT_OUT)/llvm-profdata.zip

		$(LLVM_COVERAGE_TOOLS_ZIP): $(SOONG_ZIP)
		$(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX) -f $(LLVM_COV)

		$(call dist-for-goals,droidcore-unbundled apps_only,$(LLVM_COVERAGE_TOOLS_ZIP))
		endif

		ifeq (true,$(EMMA_INSTRUMENT))
		#------------------------------------------------------------------

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.250425.005
		BUILD_ID=BP3A.250426.001

core/cc_prebuilt_internal.mk

+0 −10

Original line number	Diff line number	Diff line
		@@ -183,16 +183,6 @@ include $(BUILD_SYSTEM)/check_elf_file.mk
		ifeq ($(NATIVE_COVERAGE),true)
		ifneq (,$(strip $(LOCAL_PREBUILT_COVERAGE_ARCHIVE)))
		$(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(intermediates)/$(LOCAL_MODULE).gcnodir))
		ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)
		ifdef LOCAL_IS_HOST_MODULE
		my_coverage_path := $($(my_prefix)OUT_COVERAGE)/$(patsubst $($(my_prefix)OUT)/%,%,$(my_module_path))
		else
		my_coverage_path := $(TARGET_OUT_COVERAGE)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))
		endif
		my_coverage_path := $(my_coverage_path)/$(patsubst %.so,%,$(my_installed_module_stem)).gcnodir
		$(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(my_coverage_path)))
		$(LOCAL_BUILT_MODULE): $(my_coverage_path)
		endif
		else
		# Coverage information is needed when static lib is a dependency of another
		# coverage-enabled module.

core/config.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -1196,9 +1196,6 @@ endif

		.KATI_READONLY := JAVAC_NINJA_POOL R8_NINJA_POOL D8_NINJA_POOL

		# Soong modules that are known to have broken optional_uses_libs dependencies.
		BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST := LegacyCamera Gallery2

		# These goals don't need to collect and include Android.mks/CleanSpec.mks
		# in the source tree.
		dont_bother_goals := out product-graph

core/envsetup.mk

+1 −7

Original line number	Diff line number	Diff line
		@@ -415,7 +415,6 @@ HOST_OUT_RENDERSCRIPT_BITCODE := $(HOST_OUT_SHARED_LIBRARIES)
		HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework
		HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon
		HOST_OUT_NATIVE_TESTS := $(HOST_OUT)/nativetest64
		HOST_OUT_COVERAGE := $(HOST_OUT)/coverage
		HOST_OUT_TESTCASES := $(HOST_OUT)/testcases
		HOST_OUT_ETC := $(HOST_OUT)/etc
		.KATI_READONLY := \
		@@ -425,20 +424,17 @@ HOST_OUT_ETC := $(HOST_OUT)/etc
		HOST_OUT_JAVA_LIBRARIES \
		HOST_OUT_SDK_ADDON \
		HOST_OUT_NATIVE_TESTS \
		HOST_OUT_COVERAGE \
		HOST_OUT_TESTCASES \
		HOST_OUT_ETC

		HOST_CROSS_OUT_EXECUTABLES := $(HOST_CROSS_OUT)/bin
		HOST_CROSS_OUT_SHARED_LIBRARIES := $(HOST_CROSS_OUT)/lib
		HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT)/nativetest
		HOST_CROSS_OUT_COVERAGE := $(HOST_CROSS_OUT)/coverage
		HOST_CROSS_OUT_TESTCASES := $(HOST_CROSS_OUT)/testcases
		.KATI_READONLY := \
		HOST_CROSS_OUT_EXECUTABLES \
		HOST_CROSS_OUT_SHARED_LIBRARIES \
		HOST_CROSS_OUT_NATIVE_TESTS \
		HOST_CROSS_OUT_COVERAGE \
		HOST_CROSS_OUT_TESTCASES

		HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj
		@@ -993,15 +989,13 @@ TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib
		TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/$(TARGET_COPY_OUT_VENDOR)/lib
		TARGET_ROOT_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)
		TARGET_ROOT_OUT_BIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/bin
		TARGET_OUT_COVERAGE := $(PRODUCT_OUT)/coverage
		.KATI_READONLY := \
		TARGET_OUT_UNSTRIPPED \
		TARGET_OUT_EXECUTABLES_UNSTRIPPED \
		TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED \
		TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED \
		TARGET_ROOT_OUT_UNSTRIPPED \
		TARGET_ROOT_OUT_BIN_UNSTRIPPED \
		TARGET_OUT_COVERAGE
		TARGET_ROOT_OUT_BIN_UNSTRIPPED

		TARGET_RAMDISK_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_RAMDISK)
		TARGET_RAMDISK_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)