diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-01-10 12:08:23 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-01-19 09:43:05 +0000 |
| commit | ccb04450279c53eda250ac3e20b75cd07bcd1f7e (patch) | |
| tree | b7465ccb8c71931bcc64f3fa19c90be70d6baf54 /tests/CoreTests | |
| parent | 0ac7232b7cd55806b4fd231899a57a20c7f7bdd8 (diff) | |
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.
(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)
Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
Diffstat (limited to 'tests/CoreTests')
| -rw-r--r-- | tests/CoreTests/android/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/CoreTests/android/Android.mk b/tests/CoreTests/android/Android.mk index 5f3d0d9a33bc..c9f11615381f 100644 --- a/tests/CoreTests/android/Android.mk +++ b/tests/CoreTests/android/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := \ $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt org.apache.http.legacy +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := CoreTests |