p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "ATest: Sync auto_test_config for multilib modules" am: f2bea1b296 

am: 7e7f79c138

Change-Id: If750166d1ece0524f1a69306335e37341de0ff33
This commit is contained in:
yangbill 2018-07-26 19:00:21 -07:00 committed by android-build-merger
parent d4ed885137 7e7f79c138
commit aa595dc2bb
2 changed files with 61 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/autogen_test_config.mk
View File

@ -29,9 +29,10 @@ else
autogen_test_config_template := $(NATIVE_TEST_CONFIG_TEMPLATE) autogen_test_config_template := $(NATIVE_TEST_CONFIG_TEMPLATE)
endif endif
# Auto generating test config file for native test # 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) $(autogen_test_config_file) : $(autogen_test_config_template)
@echo "Auto generating test config $(notdir $@)" @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 my_auto_generate_config := true
else else
# Auto generating test config file for instrumentation test # 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_INTERMEDIATE_TARGETS += $(autogen_test_config_file)
$(LOCAL_BUILT_MODULE): $(autogen_test_config_file) $(LOCAL_BUILT_MODULE): $(autogen_test_config_file)
ALL_MODULES.$(my_register_name).auto_test_config := true ALL_MODULES.$(my_register_name).auto_test_config := true
$(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_autogen := true
else else
autogen_test_config_file := autogen_test_config_file :=
endif endif

43
core/base_rules.mk
View File

@ -566,12 +566,17 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem))) \ $(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem))) \
$(eval my_compat_dist_config_$(suite) := )) $(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
$(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files := true
# LOCAL_COMPATIBILITY_SUPPORT_FILES is a list of <src>[:<dest>]. # Make sure we only add the files once for multilib modules.
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ 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), \ $(eval my_compat_dist_$(suite) += $(foreach f, $(LOCAL_COMPATIBILITY_SUPPORT_FILES), \
$(eval p := $(subst :,$(space),$(f))) \ $(eval p := $(subst :,$(space),$(f))) \
$(eval s := $(word 1,$(p))) \ $(eval s := $(word 1,$(p))) \
@ -579,8 +584,8 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(s):$(dir)/$(n))))) $(s):$(dir)/$(n)))))
test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml) test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml)
ifeq (,$(test_config)) ifeq (,$(test_config))
ifneq (true,$(is_native)) ifneq (true,$(is_native))
is_instrumentation_test := true is_instrumentation_test := true
ifeq (true, $(LOCAL_IS_HOST_MODULE)) ifeq (true, $(LOCAL_IS_HOST_MODULE))
@ -605,30 +610,30 @@ ifeq (,$(test_config))
endif endif
endif endif
endif endif
endif endif
is_instrumentation_test := is_instrumentation_test :=
ifneq (,$(test_config)) ifneq (,$(test_config))
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(test_config):$(dir)/$(LOCAL_MODULE).config))) $(test_config):$(dir)/$(LOCAL_MODULE).config)))
endif endif
test_config := test_config :=
ifneq (,$(wildcard $(LOCAL_PATH)/DynamicConfig.xml)) ifneq (,$(wildcard $(LOCAL_PATH)/DynamicConfig.xml))
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(LOCAL_PATH)/DynamicConfig.xml:$(dir)/$(LOCAL_MODULE).dynamic))) $(LOCAL_PATH)/DynamicConfig.xml:$(dir)/$(LOCAL_MODULE).dynamic)))
endif endif
ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config)) ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config))
$(foreach extra_config, $(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config), \ $(foreach extra_config, $(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config), \
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(extra_config):$(dir)/$(notdir $(extra_config)))))) $(extra_config):$(dir)/$(notdir $(extra_config))))))
endif endif
endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files
ifneq ($(my_test_data_file_pairs),) ifneq ($(my_test_data_file_pairs),)