diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-01-17 15:41:06 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-01-17 15:41:06 +0000 |
| commit | 3da8b565a87de7d33569dda01ce7ac33a53368e0 (patch) | |
| tree | d4ead9d631273f63f73fa671dc64662c3e8b3203 | |
| parent | 675a0f073a775a85e42fd8534b5ec0b453b62869 (diff) | |
| download | android_packages_providers_DownloadProvider-3da8b565a87de7d33569dda01ce7ac33a53368e0.tar.gz android_packages_providers_DownloadProvider-3da8b565a87de7d33569dda01ce7ac33a53368e0.tar.bz2 android_packages_providers_DownloadProvider-3da8b565a87de7d33569dda01ce7ac33a53368e0.zip | |
Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Change-Id: I8b29b7d78c97c648d3c98067ac7b050b0a106369
| -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) |