| commit | 3da1d77e2711683f11958cbc5cd862c7b288cfb4 | [log] [tgz] |
|---|---|---|
| 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:07 2016 +0000 |
| tree | 11269e792f1ec175ac568cae8a09d7916006e645 | |
| parent | e259ceef2576204ee4fac69e9603d72fa6d2d333 [diff] |
Avoid JUnit4 collision in android-support-test, mockito-target Bug: 31072145 Test: make droid checkbuild Change-Id: Id3c0c66de8d82418f7ae2ac4b72607956f56f0c3
diff --git a/tests/Android.mk b/tests/Android.mk index 59cba42..322dad2 100644 --- a/tests/Android.mk +++ b/tests/Android.mk
@@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - mockito-target + mockito-target-minus-junit4 include $(BUILD_PACKAGE)