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

Commit 66d2f42d authored by nelsonli's avatar nelsonli Committed by android-build-merger
Browse files

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

am: ef2c1531

Change-Id: Ib3e1c926d1eb83f35512c76e7a73358bf9495bc6
parents e0b9cfc6 ef2c1531

core/base_rules.mk

+5 −2
Original line number Diff line number Diff line
@@ -583,8 +583,11 @@ else 
      $(eval n := $(or $(word 2,$(p)),$(notdir $(word 1, $(p))))) \

      $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

        $(s):$(dir)/$(n)))))



  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

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ LOCAL_STATIC_LIBRARIES:= 
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:=