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

Avoid JUnit4 collision in android-support-test, mockito-target

Browse source 
Bug: 31072145
Test: make droid checkbuild

Change-Id: I507b476694f88cc960804904feff330e6f9358c4
This commit is contained in:
Guang Zhu 2016-08-24 10:49:24 -07:00
parent 6b5d1cac6d
commit d8539fbb9b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/Android.mk
View file

@ -24,7 +24,7 @@ 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-minus-junit4
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)