| commit | 405796766a63c700aeb9bc1413b74c4b7f70963e | [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:20 2016 +0000 |
| tree | 28f6f2d6ca3407615db50a91a98dd4b622a1dc60 | |
| parent | e0607665e353d91d7ce5069acd1baab222fadbdd [diff] |
Avoid JUnit4 collision in android-support-test, mockito-target Bug: 31072145 Test: make droid checkbuild Change-Id: I3fa71d30b139461e36bec746fdac8eee048273be
diff --git a/tests/Android.mk b/tests/Android.mk index 8f500de..2c81c5d 100644 --- a/tests/Android.mk +++ b/tests/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - mockito-target \ + mockito-target-minus-junit4 \ android-support-test LOCAL_JAVA_LIBRARIES := android.test.runner