openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Force test config to be updated when auto_gen_test_config.py is changed"

This commit is contained in:
Treehugger Robot 2018-01-02 06:27:35 +00:00 committed by Gerrit Code Review
parent 9c2b798143 2b334f5c92
commit a52691b12a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/autogen_test_config.mk
View File

@ -40,10 +40,14 @@ else
my_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE) my_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)
endif endif
ifneq (,$(wildcard $(my_android_manifest))) ifneq (,$(wildcard $(my_android_manifest)))
$(autogen_test_config_file) : $(my_android_manifest) $(EMPTY_TEST_CONFIG) $(INSTRUMENTATION_TEST_CONFIG_TEMPLATE) $(autogen_test_config_file): PRIVATE_AUTOGEN_TEST_CONFIG_SCRIPT := $(AUTOGEN_TEST_CONFIG_SCRIPT)
$(autogen_test_config_file): PRIVATE_TEST_CONFIG_ANDROID_MANIFEST := $(my_android_manifest)
$(autogen_test_config_file): PRIVATE_EMPTY_TEST_CONFIG := $(EMPTY_TEST_CONFIG)
$(autogen_test_config_file): PRIVATE_TEMPLATE := $(INSTRUMENTATION_TEST_CONFIG_TEMPLATE)
$(autogen_test_config_file) : $(my_android_manifest) $(EMPTY_TEST_CONFIG) $(INSTRUMENTATION_TEST_CONFIG_TEMPLATE) $(AUTOGEN_TEST_CONFIG_SCRIPT)
@echo "Auto generating test config $(notdir $@)" @echo "Auto generating test config $(notdir $@)"
@rm -f $@ @rm -f $@
$(hide) $(AUTOGEN_TEST_CONFIG_SCRIPT) $@ $^ $(hide) $(PRIVATE_AUTOGEN_TEST_CONFIG_SCRIPT) $@ $(PRIVATE_TEST_CONFIG_ANDROID_MANIFEST) $(PRIVATE_EMPTY_TEST_CONFIG) $(PRIVATE_TEMPLATE)
my_auto_generate_config := true my_auto_generate_config := true
endif # ifeq (,$(wildcard $(my_android_manifest))) endif # ifeq (,$(wildcard $(my_android_manifest)))
endif # ifneq (true,$(is_native)) endif # ifneq (true,$(is_native))