Merge "Prepare for removal of legacy-test from default targets" am: ec6226a6e6 am: 1655131ad9
am: 8be70727ed
Change-Id: I28260538445d0b218ae629bf245f2067beef1263
diff --git a/tests/Android.mk b/tests/Android.mk
index 655ec16..dc3cbba 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -8,7 +8,11 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_INSTRUMENTATION_FOR := DownloadProvider
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := mockwebserver dexmaker mockito-target
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ mockwebserver \
+ dexmaker \
+ mockito-target \
+ legacy-android-test
LOCAL_PACKAGE_NAME := DownloadProviderTests
LOCAL_CERTIFICATE := media
diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk
index 41ceabc..62f4d02 100644
--- a/tests/permission/Android.mk
+++ b/tests/permission/Android.mk
@@ -8,6 +8,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := DownloadProviderPermissionTests
include $(BUILD_PACKAGE)
diff --git a/tests/public_api_access/Android.mk b/tests/public_api_access/Android.mk
index 6c6db1f..66f2f10 100644
--- a/tests/public_api_access/Android.mk
+++ b/tests/public_api_access/Android.mk
@@ -8,6 +8,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := DownloadPublicApiAccessTests
include $(BUILD_PACKAGE)