From 2b334f5c929a435d2e41c484517c1c7f0500f826 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Fri, 22 Dec 2017 20:23:22 -0800 Subject: [PATCH] Force test config to be updated when auto_gen_test_config.py is changed Bug: 70981774,69929803 Test: Modify tools/auto_gen_test_config.py, confirm the test config file is updated. Change-Id: I55bd07c8bdc6e26f9c8ad6df733d2c5da09d0ceb --- core/autogen_test_config.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/autogen_test_config.mk b/core/autogen_test_config.mk index 9f3a2a6b2..c359bacdf 100644 --- a/core/autogen_test_config.mk +++ b/core/autogen_test_config.mk @@ -40,10 +40,14 @@ else my_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE) endif 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 $@)" @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 endif # ifeq (,$(wildcard $(my_android_manifest))) endif # ifneq (true,$(is_native))