Merge "ATest: Sync auto_test_config for multilib modules" (7e7f79c1) · Commits · e / os / android_build

core/autogen_test_config.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,9 +29,10 @@ else
		autogen_test_config_template := $(NATIVE_TEST_CONFIG_TEMPLATE)
		endif
		# Auto generating test config file for native test
		$(autogen_test_config_file): PRIVATE_MODULE_NAME := $(LOCAL_MODULE)
		$(autogen_test_config_file) : $(autogen_test_config_template)
		@echo "Auto generating test config $(notdir $@)"
		$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE)&g' $< > $@
		$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE_NAME)&g' $< > $@
		my_auto_generate_config := true
		else
		# Auto generating test config file for instrumentation test
		@@ -52,6 +53,7 @@ ifeq (true,$(my_auto_generate_config))
		LOCAL_INTERMEDIATE_TARGETS += $(autogen_test_config_file)
		$(LOCAL_BUILT_MODULE): $(autogen_test_config_file)
		ALL_MODULES.$(my_register_name).auto_test_config := true
		$(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_autogen := true
		else
		autogen_test_config_file :=
		endif

+58 −53

Original line number	Diff line number	Diff line
		@@ -566,10 +566,15 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
		$(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem))) \
		$(eval my_compat_dist_config_$(suite) := ))


		# Make sure we only add the files once for multilib modules.
		ifndef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files
		ifdef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files
		# Sync the auto_test_config value for multilib modules.
		ifdef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_autogen
		ALL_MODULES.$(my_register_name).auto_test_config := true
		endif
		else
		$(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files := true

		# LOCAL_COMPATIBILITY_SUPPORT_FILES is a list of <src>[:<dest>].
		$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
		$(eval my_compat_dist_$(suite) += $(foreach f, $(LOCAL_COMPATIBILITY_SUPPORT_FILES), \