commit b7099adc38fd3760f96721e9b3a768e4a5068c97
author Paul Duffin <paulduffin@google.com> Tue Jan 17 14:49:43 2017 +0000
committer Paul Duffin <paulduffin@google.com> Wed Jan 18 15:30:16 2017 +0000
tree b2559d6f5aeaad33c56e635ce0c4211b0a86ce12
parent e5b6f5b4fed61798be19cbec76688e0d52d0e38a

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: I1cc80298ffd6402b91227d45f86fd958d589da50

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 89fb2b5..b3aaa23 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,7 +7,8 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
     ContactsProviderTestUtils \
     android-support-test \
-    mockito-target-minus-junit4
+    mockito-target-minus-junit4 \
+    legacy-android-test
 
 LOCAL_JAVA_LIBRARIES := android.test.runner