commit cb6afd1d81a968c241ec5b38423e9478b54a8f21
author Stuart Scott <stuartscott@google.com> Tue Oct 20 16:45:28 2015 -0700
committer Stuart Scott <stuartscott@google.com> Tue Oct 20 19:05:09 2015 -0700
tree f9db49d2f65ec79dd20c7049a52039ecc2bab5aa
parent 73cd71156d2f3c6c9b598cf391bd005670d35dac

Add dependancies on test apps outside of a test's directory.

bug:21762834
Change-Id: I115ebb0d1dcd7ff9e6875cd9e589706a57bab6d4

hostsidetests/jank/Android.mk

diff --git a/hostsidetests/jank/Android.mk b/hostsidetests/jank/Android.mk
index 992d45c..003d0d6 100644
--- a/hostsidetests/jank/Android.mk
+++ b/hostsidetests/jank/Android.mk
@@ -44,5 +44,7 @@
 
 include $(BUILD_CTS_HOST_JAVA_LIBRARY)
 
+$(COMPATIBILITY_TESTCASES_OUT_cts_v2)/CtsJankHostTestCases.jar : $(COMPATIBILITY_TESTCASES_OUT_cts_v2)/CtsOpenGlPerf2TestCases.apk
+
 # Build the library using its own makefile
 include $(call all-makefiles-under,$(LOCAL_PATH))

hostsidetests/ui/Android.mk

diff --git a/hostsidetests/ui/Android.mk b/hostsidetests/ui/Android.mk
index 033105e..b0de7fc 100644
--- a/hostsidetests/ui/Android.mk
+++ b/hostsidetests/ui/Android.mk
@@ -28,6 +28,8 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
+$(COMPATIBILITY_TESTCASES_OUT_cts_v2)/CtsUiHostTestCases.jar : $(COMPATIBILITY_TESTCASES_OUT_cts_v2)/com.replica.replicaisland.apk
+
 LOCAL_CTS_TEST_PACKAGE := android.ui.cts
 
 # Tag this module as a cts_v2 test artifact