diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-01-18 15:33:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-18 15:33:01 +0000 |
| commit | b4a7c33cbe85b2a535664946a69f3117154d348a (patch) | |
| tree | 19c05a3729ecbeea0394e8543545f3cc135c2def /tests | |
| parent | 2a64a77a20cab7bdb920ede59eb51879ef1e7c66 (diff) | |
| parent | 199c9d1ba80ba3b57a62ac3685f4401a986daa64 (diff) | |
| download | android_packages_providers_DownloadProvider-b4a7c33cbe85b2a535664946a69f3117154d348a.tar.gz android_packages_providers_DownloadProvider-b4a7c33cbe85b2a535664946a69f3117154d348a.tar.bz2 android_packages_providers_DownloadProvider-b4a7c33cbe85b2a535664946a69f3117154d348a.zip | |
Merge "Prepare for removal of legacy-test from default targets" am: ec6226a6e6 am: 1655131ad9 am: 8be70727ed
am: 199c9d1ba8
Change-Id: I4cdfa049d3a5fb4b050aa02efdf7b1d8f619c3c5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 6 | ||||
| -rw-r--r-- | tests/permission/Android.mk | 1 | ||||
| -rw-r--r-- | tests/public_api_access/Android.mk | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 655ec168..dc3cbbad 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -8,7 +8,11 @@ LOCAL_MODULE_TAGS := tests 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 41ceabc2..62f4d024 100644 --- a/tests/permission/Android.mk +++ b/tests/permission/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests 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 6c6db1f4..66f2f101 100644 --- a/tests/public_api_access/Android.mk +++ b/tests/public_api_access/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests 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) |