diff options
| author |   Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:11 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-08 15:35:04 +0100 |
| commit | ddc9c28ca8c6b910ce9fd4207d3b8b42c9bc6e73 (patch) | |
| tree | 4c2d7c30c501bb24f9cc30c155085989b397532c | |
| parent | f58518ea9c716e1e3d904d50871051ec434290c2 (diff) | |
| download | latinime-ddc9c28ca8c6b910ce9fd4207d3b8b42c9bc6e73.tar.gz latinime-ddc9c28ca8c6b910ce9fd4207d3b8b42c9bc6e73.tar.xz latinime-ddc9c28ca8c6b910ce9fd4207d3b8b42c9bc6e73.zip | |
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: I160c136ecd1089a2b13d5cdba9eee1287aad93f9
Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
| -rw-r--r-- | tests/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 0b5449143..cc5761129 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -24,7 +24,10 @@ LOCAL_AAPT_FLAGS += -0 .dict # Do not compress test data file LOCAL_AAPT_FLAGS += -0 .txt -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) |