Avoid JUnit4 collision in android-support-test, mockito-target
Bug: 31072145
Test: make droid checkbuild
Change-Id: I1462b0ba70aa3ede1a5b2ccc407e234dea1eb1b2
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk
index 3703b97..4699fd5 100644
--- a/core/tests/coretests/Android.mk
+++ b/core/tests/coretests/Android.mk
@@ -30,7 +30,7 @@
guava \
littlemock \
android-support-test \
- mockito-target \
+ mockito-target-minus-junit4 \
espresso-core \
ub-uiautomator \
platform-test-annotations
diff --git a/core/tests/utiltests/Android.mk b/core/tests/utiltests/Android.mk
index 6d1ebb4..de962fa 100644
--- a/core/tests/utiltests/Android.mk
+++ b/core/tests/utiltests/Android.mk
@@ -14,7 +14,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
- mockito-target
+ mockito-target-minus-junit4
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/media/tests/MediaFrameworkTest/Android.mk b/media/tests/MediaFrameworkTest/Android.mk
index 5d73730..20575e0 100644
--- a/media/tests/MediaFrameworkTest/Android.mk
+++ b/media/tests/MediaFrameworkTest/Android.mk
@@ -10,7 +10,7 @@
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
LOCAL_STATIC_JAVA_LIBRARIES := \
- mockito-target \
+ mockito-target-minus-junit4 \
android-support-test \
android-ex-camera2
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
diff --git a/tests/Camera2Tests/CameraToo/tests/Android.mk b/tests/Camera2Tests/CameraToo/tests/Android.mk
index 0b58243..eb8f6c3 100644
--- a/tests/Camera2Tests/CameraToo/tests/Android.mk
+++ b/tests/Camera2Tests/CameraToo/tests/Android.mk
@@ -20,6 +20,6 @@
LOCAL_INSTRUMENTATION_FOR := CameraToo
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under,src)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4
include $(BUILD_PACKAGE)