Merge changes from topic 'mockito-without-junit'
* changes:
Use mockito-target-minus-junit4.
android.core.tests.libcore.package.tests: add mockito to the dependencies
diff --git a/tests/core/libcore/libcore/Android.mk b/tests/core/libcore/libcore/Android.mk
index ec6228b..c9aea5e 100644
--- a/tests/core/libcore/libcore/Android.mk
+++ b/tests/core/libcore/libcore/Android.mk
@@ -16,6 +16,9 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.libcore
-LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-api
+# Note that we're not pulling in junit4 here because it's provided by
+# android.test.runner (which might pull in a different version from the
+# one that would be pulled in here).
+LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-target-minus-junit4
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/tests/Android.mk b/tests/core/libcore/tests/Android.mk
index e9b9422..6429558 100644
--- a/tests/core/libcore/tests/Android.mk
+++ b/tests/core/libcore/tests/Android.mk
@@ -16,6 +16,6 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.tests
-LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-api
+LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-target-minus-junit4
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
