commit ef2c15314b8b0ccceff25fd6d1c01995c65d1093
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 06 17:58:12 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 06 17:58:12 2018 +0000
tree f9bca13529c1674afb49dd6ba688ad86f2121e2e
parent a130af98edd45c35142daeb59200e6bd6dbdb84a
parent 9009311630852032233b483505b75de74fa367d8

Merge "Build System: Add variable for copying test config"

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 770a16c..037b2cb 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -583,8 +583,11 @@
       $(eval n := $(or $(word 2,$(p)),$(notdir $(word 1, $(p))))) \
       $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
         $(s):$(dir)/$(n)))))
-
-  test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml)
+  ifeq (,$(LOCAL_TEST_CONFIG))
+    test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml)
+  else
+    test_config := $(LOCAL_PATH)/$(LOCAL_TEST_CONFIG)
+  endif
   ifeq (,$(test_config))
     ifneq (true,$(is_native))
       is_instrumentation_test := true

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index e7116a5..1c45b2b 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -266,6 +266,7 @@
 LOCAL_STRIP_MODULE:=
 LOCAL_SYSTEM_SHARED_LIBRARIES:=none
 LOCAL_TARGET_REQUIRED_MODULES:=
+LOCAL_TEST_CONFIG:=
 LOCAL_TEST_CONFIG_OPTIONS:=
 LOCAL_TEST_DATA:=
 LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=