Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't pull in external/junit through mockito

Browse Source 
android-support-test provides a different version of junit

FIXED=30481239

Change-Id: I6d8f52d5f82b4c9905da8cc4a6ca79216eba9e26
(cherry picked from commit d3868cfc63)
This commit is contained in:
Mitchell Wills
2016-07-28 17:04:38 -07:00
parent 47fb68bd24
commit 079b2f342c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/utils/testutils/Android.mk
View File

@@ -25,6 +25,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java)
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
mockito-target
mockito-target-minus-junit4
include $(BUILD_STATIC_JAVA_LIBRARY)