StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-06 17:58:12 +00:00
committed by Gerrit Code Review
parent a130af98ed 9009311630
commit ef2c15314b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/base_rules.mk
View File

@@ -583,8 +583,11 @@ else
$(eval n := $(or $(word 2,$(p)),$(notdir $(word 1, $(p))))) \ $(eval n := $(or $(word 2,$(p)),$(notdir $(word 1, $(p))))) \
$(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(s):$(dir)/$(n))))) $(s):$(dir)/$(n)))))
ifeq (,$(LOCAL_TEST_CONFIG))
test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml) test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml)
else
test_config := $(LOCAL_PATH)/$(LOCAL_TEST_CONFIG)
endif
ifeq (,$(test_config)) ifeq (,$(test_config))
ifneq (true,$(is_native)) ifneq (true,$(is_native))
is_instrumentation_test := true is_instrumentation_test := true

1
core/clear_vars.mk
View File

@@ -266,6 +266,7 @@ LOCAL_STATIC_LIBRARIES:=
LOCAL_STRIP_MODULE:= LOCAL_STRIP_MODULE:=
LOCAL_SYSTEM_SHARED_LIBRARIES:=none LOCAL_SYSTEM_SHARED_LIBRARIES:=none
LOCAL_TARGET_REQUIRED_MODULES:= LOCAL_TARGET_REQUIRED_MODULES:=
LOCAL_TEST_CONFIG:=
LOCAL_TEST_CONFIG_OPTIONS:= LOCAL_TEST_CONFIG_OPTIONS:=
LOCAL_TEST_DATA:= LOCAL_TEST_DATA:=
LOCAL_TEST_MODULE_TO_PROGUARD_WITH:= LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=