diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-01-17 14:49:42 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-01-18 15:59:32 +0000 |
| commit | ef40d7a3b10a99bf014fd4f62a7fb04807a0d775 (patch) | |
| tree | 8fdfa95fe39dcbea2d40f4ed59e0bb5b49629a28 | |
| parent | f89e8ca407cded7465735d76454c64293ea65d2b (diff) | |
| download | platform_packages_apps_StorageManager-o-preview.tar.gz platform_packages_apps_StorageManager-o-preview.tar.bz2 platform_packages_apps_StorageManager-o-preview.zip | |
Prepare for removal of legacy-test from default targetsandroid-o-preview-1o-preview
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
Merged-In: I84ed2bb7ea7c9cca241cc5ccac6ecf70521d8c88
Change-Id: Ifbc5f84c584dafd684de44702e6cba89f8642aa2
| -rw-r--r-- | tests/unit/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk index c7fca1f..5de3e01 100644 --- a/tests/unit/Android.mk +++ b/tests/unit/Android.mk @@ -6,7 +6,10 @@ LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-test \ + mockito-target \ + legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) |