Merge "Add a coverage suffix to avoid Ninja file regeneration." into main (ca2fe2cd) · Commits · e / os / android_build

core/base_rules.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -340,7 +340,7 @@ LOCAL_BUILT_MODULE := $(intermediates)/$(my_built_module_stem)

	ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))		ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))
	ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
	$(call pretty-error, LOCAL_SOONG_INSTALLED_MODULE can only be used from $(SOONG_ANDROID_MK))		$(call pretty-error, LOCAL_MODULE_MAKEFILE can only be used from $(SOONG_ANDROID_MK))
	endif		endif
	# Use the install path requested by Soong.		# Use the install path requested by Soong.
	LOCAL_INSTALLED_MODULE := $(LOCAL_SOONG_INSTALLED_MODULE)		LOCAL_INSTALLED_MODULE := $(LOCAL_SOONG_INSTALLED_MODULE)

core/config.mk

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1266,8 +1266,15 @@ include $(BUILD_SYSTEM)/sysprop_config.mk
	# consistency with those defined in BoardConfig.mk files.		# consistency with those defined in BoardConfig.mk files.
	include $(BUILD_SYSTEM)/android_soong_config_vars.mk		include $(BUILD_SYSTEM)/android_soong_config_vars.mk

	SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT).variables		# EMMA_INSTRUMENT is set to true when coverage is enabled. Creates a suffix to
	SOONG_EXTRA_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT).extra.variables		# differeciate the coverage version of ninja files. This will save 5 minutes of
			# build time used to regenerate ninja.
			ifeq (true,$(EMMA_INSTRUMENT))
			COVERAGE_SUFFIX := .coverage
			endif

			SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).variables
			SOONG_EXTRA_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).extra.variables

	ifeq ($(CALLED_FROM_SETUP),true)		ifeq ($(CALLED_FROM_SETUP),true)
	include $(BUILD_SYSTEM)/ninja_config.mk		include $(BUILD_SYSTEM)/ninja_config.mk

core/dex_preopt_config.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	DEX_PREOPT_CONFIG := $(SOONG_OUT_DIR)/dexpreopt.config		DEX_PREOPT_CONFIG := $(SOONG_OUT_DIR)/dexpreopt${COVERAGE_SUFFIX}.config

	ENABLE_PREOPT := true		ENABLE_PREOPT := true
	ENABLE_PREOPT_BOOT_IMAGES := true		ENABLE_PREOPT_BOOT_IMAGES := true

core/main.mk

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -31,8 +31,7 @@ endif
	.KATI_READONLY := $(foreach n,$(SOONG_CONFIG_NAMESPACES),SOONG_CONFIG_$(n))		.KATI_READONLY := $(foreach n,$(SOONG_CONFIG_NAMESPACES),SOONG_CONFIG_$(n))
	.KATI_READONLY := $(foreach n,$(SOONG_CONFIG_NAMESPACES),$(foreach k,$(SOONG_CONFIG_$(n)),SOONG_CONFIG_$(n)_$(k)))		.KATI_READONLY := $(foreach n,$(SOONG_CONFIG_NAMESPACES),$(foreach k,$(SOONG_CONFIG_$(n)),SOONG_CONFIG_$(n)_$(k)))

	include $(SOONG_MAKEVARS_MK)		include $(SOONG_OUT_DIR)/make_vars-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk

	YACC :=$= $(BISON) -d		YACC :=$= $(BISON) -d

	include $(BUILD_SYSTEM)/clang/config.mk		include $(BUILD_SYSTEM)/clang/config.mk
	@@ -276,12 +275,15 @@ FULL_BUILD := true
	# Include all of the makefiles in the system		# Include all of the makefiles in the system
	#		#

	subdir_makefiles := $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT).mk $(SOONG_ANDROID_MK)		subdir_makefiles := $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk $(SOONG_ANDROID_MK)

	# Android.mk files are only used on Linux builds, Mac only supports Android.bp		# Android.mk files are only used on Linux builds, Mac only supports Android.bp
	ifeq ($(HOST_OS),linux)		ifeq ($(HOST_OS),linux)
	subdir_makefiles += $(file <$(OUT_DIR)/.module_paths/Android.mk.list)		subdir_makefiles += $(file <$(OUT_DIR)/.module_paths/Android.mk.list)
	endif		endif
	subdir_makefiles += $(SOONG_OUT_DIR)/late-$(TARGET_PRODUCT).mk
			subdir_makefiles += $(SOONG_OUT_DIR)/late-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk

	subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)		subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)
	.KATI_READONLY := subdir_makefiles_total		.KATI_READONLY := subdir_makefiles_total

core/soong_config.mk

+3 −3

Original line number	Original line	Diff line number	Diff line
	SOONG_MAKEVARS_MK := $(SOONG_OUT_DIR)/make_vars-$(TARGET_PRODUCT).mk		SOONG_MAKEVARS_MK := $(SOONG_OUT_DIR)/make_vars-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk
	SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android-$(TARGET_PRODUCT).mk		SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk

	include $(BUILD_SYSTEM)/art_config.mk		include $(BUILD_SYSTEM)/art_config.mk
	include $(BUILD_SYSTEM)/dex_preopt_config.mk		include $(BUILD_SYSTEM)/dex_preopt_config.mk
	@@ -26,7 +26,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
	$(shell mkdir -p $(dir $(SOONG_VARIABLES)))		$(shell mkdir -p $(dir $(SOONG_VARIABLES)))
	$(call json_start)		$(call json_start)

	$(call add_json_str, Make_suffix, -$(TARGET_PRODUCT))		$(call add_json_str, Make_suffix, -$(TARGET_PRODUCT)$(COVERAGE_SUFFIX))

	$(call add_json_str, BuildId, $(BUILD_ID))		$(call add_json_str, BuildId, $(BUILD_ID))
	$(call add_json_str, BuildFingerprintFile, build_fingerprint.txt)		$(call add_json_str, BuildFingerprintFile, build_fingerprint.txt)