Merge "Avoid JUnit4 collision in android-support-test, mockito-target"

core/tests/coretests/Android.mk

@@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     guava \
     littlemock \
     android-support-test \
-    mockito-target \
+    mockito-target-minus-junit4 \
     espresso-core \
     ub-uiautomator \
     platform-test-annotations

core/tests/utiltests/Android.mk

@@ -14,7 +14,7 @@ LOCAL_SRC_FILES += src/android/util/IRemoteMemoryIntArray.aidl
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target
+    mockito-target-minus-junit4
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 

media/tests/MediaFrameworkTest/Android.mk

@@ -10,7 +10,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 LOCAL_JAVA_LANGUAGE_VERSION := 1.8
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-target \
+    mockito-target-minus-junit4 \
     android-support-test \
     android-ex-camera2
 

services/tests/servicestests/Android.mk

@@ -21,7 +21,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     services.usage \
     guava \
     android-support-test \
-    mockito-target \
+    mockito-target-minus-junit4 \
     ShortcutManagerTestUtils
 
 LOCAL_JAVA_LIBRARIES := android.test.runner

tests/Camera2Tests/CameraToo/tests/Android.mk

@@ -20,6 +20,6 @@ LOCAL_PACKAGE_NAME := CameraTooTests
 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)