nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
main
Paul Duffin 2017-03-01 13:21:11 +00:00
parent f58518ea9c
commit ddc9c28ca8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Android.mk
View File

@ -24,7 +24,10 @@ LOCAL_AAPT_FLAGS += -0 .dict
# Do not compress test data file # Do not compress test data file
LOCAL_AAPT_FLAGS += -0 .txt 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. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)