Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e0978d4 authored by Dan Shi's avatar Dan Shi Committed by android-build-merger
Browse files

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

am: a05d8cd8

Change-Id: Ifd6b8d972549ff4e97c031705d09cdc49d55f742
parents c819a300 a05d8cd8

core/autogen_test_config.mk

+6 −2
Original line number Diff line number Diff line
@@ -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))