| commit | 01c560f4af25c4a2d006b844d79f09458deec9a4 | [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 19:37:46 2016 +0000 |
| tree | 573b8850f448c2cd2ea5bb5752aa9740f8eed711 | |
| parent | d3ca5980f7d85e706d39af6da26686b6632f1d46 [diff] [blame] |
Avoid JUnit4 collision in android-support-test, mockito-target Bug: 31072145 Test: make droid checkbuild Change-Id: I1462b0ba70aa3ede1a5b2ccc407e234dea1eb1b2
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 89b5adc..811c0e6 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk
@@ -21,7 +21,7 @@ services.usage \ guava \ android-support-test \ - mockito-target \ + mockito-target-minus-junit4 \ ShortcutManagerTestUtils LOCAL_JAVA_LIBRARIES := android.test.runner