commit 562d700ab97368524688e1d64312292292d55166
author Ying Wang <wangying@google.com> Thu Jun 04 11:21:49 2015 -0700
committer Ying Wang <wangying@google.com> Thu Jun 04 11:22:23 2015 -0700
tree ab56310dbdb93b4275ae030ad1e9fb427e26873c
parent 50661cf872fe86ff3535844016a27c77e96bc30c

Make AndroidTest.xml optional.

Make AndroidTest.xml optional for compatibility suite module.

Change-Id: I6622e17191fa67b33c577056681b989516f3a3a8

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index aa3dded..efa084e 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -607,9 +607,13 @@
 $(cts_testcase_file) : $(LOCAL_BUILT_MODULE) | $(ACP)
 	$(copy-file-to-new-target)
 
+cts_testcase_config :=
+android_test_xml := $(wildcard $(LOCAL_PATH)/AndroidTest.xml)
+ifdef android_test_xml
 cts_testcase_config := $(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(LOCAL_MODULE).config
-$(cts_testcase_config) : $(LOCAL_PATH)/AndroidTest.xml
+$(cts_testcase_config) : $(android_test_xml)
 	$(copy-file-to-new-target)
+endif
 
 COMPATIBILITY.$(LOCAL_COMPATIBILITY_SUITE).FILES := \
   $(COMPATIBILITY.$(LOCAL_COMPATIBILITY_SUITE).FILES) \