commit 199c9d1ba80ba3b57a62ac3685f4401a986daa64
author Paul Duffin <paulduffin@google.com> Wed Jan 18 15:27:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 15:27:19 2017 +0000
tree 276dba24bd8c53f325484c4497ecd8e0c7e8c403
parent 5b366468f22bb2e6f6c32adec01b71b1b47eadc8
parent 8be70727ed589616fbd2fff0c11635f2c5a61151

Merge "Prepare for removal of legacy-test from default targets" am: ec6226a6e6 am: 1655131ad9
am: 8be70727ed

Change-Id: I28260538445d0b218ae629bf245f2067beef1263

tests/Android.mk

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
 

tests/permission/Android.mk

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)

tests/public_api_access/Android.mk

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)