| commit | d3868cfc63cd814e43367586f5706f39ec1cd5a9 | [log] [tgz] |
|---|---|---|
| author | Mitchell Wills <mwills@google.com> | Thu Jul 28 17:04:38 2016 -0700 |
| committer | Mitchell Wills <mwills@google.com> | Thu Jul 28 17:05:17 2016 -0700 |
| tree | 9134b65a218cb7348de9cb5efc32aca913f4b1ae | |
| parent | 9382c5a7e4f2e6b90d2fa0810a2074701483496f [diff] |
Don't pull in external/junit through mockito android-support-test provides a different version of junit FIXED=30481239 Change-Id: I6d8f52d5f82b4c9905da8cc4a6ca79216eba9e26
diff --git a/tests/utils/testutils/Android.mk b/tests/utils/testutils/Android.mk index d53167f..4bfd234 100644 --- a/tests/utils/testutils/Android.mk +++ b/tests/utils/testutils/Android.mk
@@ -25,6 +25,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - mockito-target + mockito-target-minus-junit4 include $(BUILD_STATIC_JAVA_LIBRARY)