commit 228b45e7fb294754835c002da61ff25021d4585b
author Paul Duffin <paulduffin@google.com> Tue Jan 10 12:08:43 2017 +0000
committer Paul Duffin <paulduffin@google.com> Fri Jan 20 11:22:59 2017 +0000
tree ee377af636911e753076c392c02cc9a9fb4f53fe
parent 827163a62fbf63f203dc35713eb58e85db298459

Prepare for removal of legacy-test from default targets

In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: I0f34fe97154240e8f8eef6816df1c794da60351e

hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk

diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk
index 88501bf..c50dbd9 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk
@@ -18,7 +18,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    legacy-android-test
 
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts