summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMitchell Wills <mwills@google.com>2016-07-29 01:37:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-29 01:37:03 +0000
commitd88b136ca46bd117f9098d487ec726807ecad0a3 (patch)
treedf8341581db375256c04867c56c4a2611561fca4 /tests
parentcdfb9c8141204ffc90eb072eae3eb25bb5b42c26 (diff)
parenta4c42f56e7068211312e9292972ef4bee3d047c4 (diff)
Merge "Don't pull in external/junit through mockito"
Diffstat (limited to 'tests')
-rw-r--r--tests/wifitests/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk
index c65a9d051..924efeeea 100644
--- a/tests/wifitests/Android.mk
+++ b/tests/wifitests/Android.mk
@@ -101,7 +101,7 @@ LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := $(jacoco_exclude)
# since neither is declared a static java library.
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
- mockito-target \
+ mockito-target-minus-junit4 \
frameworks-base-testutils \
services \
wifi-service \