commit d8539fbb9b8cb9f02e251d3abd8901d6b85ff156
author Guang Zhu <guangzhu@google.com> Wed Aug 24 10:49:24 2016 -0700
committer Guang Zhu <guangzhu@google.com> Thu Aug 25 19:43:11 2016 +0000
tree 9f2d868bb52a2ebba4747fec14cca85c74021cd8
parent 6b5d1cac6d4424beb4c315fd87a9be63a5a6f07c

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

Bug: 31072145
Test: make droid checkbuild

Change-Id: I507b476694f88cc960804904feff330e6f9358c4

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 0b54491..ad153ae 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -24,7 +24,7 @@
 # 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)