commit d236bd45deeb0d1ab95711c54e64d122e44ed4fb
author Paul Duffin <paulduffin@google.com> Tue Jan 17 14:49:43 2017 +0000
committer Paul Duffin <paulduffin@google.com> Tue Jan 17 14:49:43 2017 +0000
tree f3b93ac42e0c337ab84a95de5a81e46ae19eb8ca
parent cd1c178395738380f7181721a709116534a7c150

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

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index fc12378..9af28ab 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -3,7 +3,7 @@
 
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target legacy-android-test
 
 LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common