| commit | d15b25ba43c296a54e6cfdaf106612349ac5a588 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Wed Aug 24 10:49:23 2016 -0700 |
| committer | Guang Zhu <guangzhu@google.com> | Thu Aug 25 05:15:26 2016 +0000 |
| tree | 1977dbd66a5b76a4570f217ad6a67f26759d27e4 | |
| parent | 5b28546b267804bc60f71cea2f68428a1be9e7a9 [diff] [blame] |
Avoid JUnit4 collision in android-support-test, mockito-target Bug: 31072145 Test: make droid checkbuild Change-Id: I257899fe815855d8cb9763693063b559d5038fb8
diff --git a/tests/Android.mk b/tests/Android.mk index 07f4f00..910d893 100644 --- a/tests/Android.mk +++ b/tests/Android.mk
@@ -17,7 +17,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_STATIC_JAVA_LIBRARIES += \ - mockito-target + mockito-target-minus-junit4 LOCAL_PACKAGE_NAME := DialerTests