Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: Iae232242587ac23dd46f71b1ead4e310ca55b48c
Merged-In: Iefdd4b491bf66416a8d8241989fa8f2ef762ebbe
diff --git a/tests/Android.mk b/tests/Android.mk
index 2e7cfcd..ebf9fe1 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -6,6 +6,8 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)