diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:10 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:10 +0000 |
| commit | 1dba70cbb1b76b192392a5c4f73ffa380f4fb33a (patch) | |
| tree | 1652ca542ea55f9a14c3aaca21fbc7de942a4e9d | |
| parent | 9a92a189f67470a6ba636cf1e9f5d093608d9a96 (diff) | |
Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: I57f78df99afaa64e2afdd11efc9eab0dafb16d0b
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 0978bec05..91e127040 100644 --- a/Android.mk +++ b/Android.mk @@ -57,7 +57,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-transition \ com.android.vcard \ guava \ - libphonenumber + libphonenumber \ + legacy-android-test \ + junit LOCAL_PACKAGE_NAME := Dialer LOCAL_CERTIFICATE := shared |