Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
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)