Avoid JUnit4 collision in android-support-test, mockito-target
Bug: 30875057
Change-Id: Ib48f3d5aca127474ca5bd3ba1b91eeae33ddbef7
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index 304c982..795ce1c 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -36,7 +36,7 @@
ctsverifier-opencv \
core-tests-support \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
mockwebserver \
compatibility-device-util \
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
index 3389898..a463b59 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
index ffb2519..2f37101 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
index b39a3ce..3bbd906 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
index d96e13c..2ac759a 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
index 3719813..62ad16e 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
index 57b73e9..049691d 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/hostsidetests/shortcuts/deviceside/upgrade/Android.mk b/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
index d0c47b5..21b07a0 100644
--- a/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
@@ -37,7 +37,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
@@ -68,7 +68,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index 6ce0148..a0bfd75 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -23,7 +23,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target-minus-junit4 android-support-test
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/camera/Android.mk b/tests/camera/Android.mk
index 4065bfb..c64b958 100644
--- a/tests/camera/Android.mk
+++ b/tests/camera/Android.mk
@@ -25,7 +25,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil \
ctstestrunner \
- mockito-target \
+ mockito-target-minus-junit4 \
android-ex-camera2
LOCAL_JNI_SHARED_LIBRARIES := \
diff --git a/tests/libcore/luni/Android.mk b/tests/libcore/luni/Android.mk
index 22a975d..2df092d 100644
--- a/tests/libcore/luni/Android.mk
+++ b/tests/libcore/luni/Android.mk
@@ -24,7 +24,7 @@
core-tests \
cts-core-test-runner \
jsr166-tests \
- mockito-target \
+ mockito-target-minus-junit4 \
tzdata_update-tests
# Don't include this package in any target
diff --git a/tests/tests/animation/Android.mk b/tests/tests/animation/Android.mk
index ed42d74..fc741c8 100644
--- a/tests/tests/animation/Android.mk
+++ b/tests/tests/animation/Android.mk
@@ -26,7 +26,7 @@
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-test \
- mockito-target \
+ mockito-target-minus-junit4 \
android-common \
ctsdeviceutil \
ctstestrunner \
diff --git a/tests/tests/appwidget/Android.mk b/tests/tests/appwidget/Android.mk
index efd15d3..060c847 100644
--- a/tests/tests/appwidget/Android.mk
+++ b/tests/tests/appwidget/Android.mk
@@ -24,7 +24,7 @@
LOCAL_PACKAGE_NAME := CtsAppWidgetTestCases
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target-minus-junit4 ctstestrunner
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/tests/tests/graphics/Android.mk b/tests/tests/graphics/Android.mk
index 40beee6..eb1bfec 100644
--- a/tests/tests/graphics/Android.mk
+++ b/tests/tests/graphics/Android.mk
@@ -22,7 +22,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-annotations android-support-test mockito-target ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-annotations android-support-test mockito-target-minus-junit4 ctsdeviceutil ctstestrunner
LOCAL_JNI_SHARED_LIBRARIES := libctsgraphics_jni
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/hardware/Android.mk b/tests/tests/hardware/Android.mk
index 9b3969c..2cc09e5 100644
--- a/tests/tests/hardware/Android.mk
+++ b/tests/tests/hardware/Android.mk
@@ -59,7 +59,7 @@
ctsdeviceutil \
compatibility-device-util \
ctstestrunner \
- mockito-target \
+ mockito-target-minus-junit4 \
android-ex-camera2
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/tests/print/Android.mk b/tests/tests/print/Android.mk
index d0c1a81..42a98e5 100644
--- a/tests/tests/print/Android.mk
+++ b/tests/tests/print/Android.mk
@@ -27,7 +27,7 @@
LOCAL_PACKAGE_NAME := CtsPrintTestCases
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ctstestrunner ub-uiautomator ctsdeviceutil android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target-minus-junit4 ctstestrunner ub-uiautomator ctsdeviceutil android-support-test
LOCAL_SDK_VERSION := test_current
diff --git a/tests/tests/shortcutmanager/Android.mk b/tests/tests/shortcutmanager/Android.mk
index 245f0f6..8c03be7 100755
--- a/tests/tests/shortcutmanager/Android.mk
+++ b/tests/tests/shortcutmanager/Android.mk
@@ -23,7 +23,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/tests/tests/shortcutmanager/throttling/Android.mk b/tests/tests/shortcutmanager/throttling/Android.mk
index 59d1f57..4af2d7c 100644
--- a/tests/tests/shortcutmanager/throttling/Android.mk
+++ b/tests/tests/shortcutmanager/throttling/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
android-support-v4 \
- mockito-target \
+ mockito-target-minus-junit4 \
ctsdeviceutil \
ctstestrunner \
ub-uiautomator \
diff --git a/tests/tests/text/Android.mk b/tests/tests/text/Android.mk
index fbc7a59..679a049 100644
--- a/tests/tests/text/Android.mk
+++ b/tests/tests/text/Android.mk
@@ -28,7 +28,7 @@
ctsdeviceutillegacy \
ctstestrunner \
android-support-test \
- mockito-target \
+ mockito-target-minus-junit4 \
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/transition/Android.mk b/tests/tests/transition/Android.mk
index 5370d4f..00d8ad5 100644
--- a/tests/tests/transition/Android.mk
+++ b/tests/tests/transition/Android.mk
@@ -26,7 +26,7 @@
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-test \
- mockito-target \
+ mockito-target-minus-junit4 \
android-common \
ctsdeviceutil \
ctstestrunner \
diff --git a/tests/tests/uirendering/Android.mk b/tests/tests/uirendering/Android.mk
index 2aeea5e..f101fcc 100644
--- a/tests/tests/uirendering/Android.mk
+++ b/tests/tests/uirendering/Android.mk
@@ -28,7 +28,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ctstestrunner \
- mockito-target \
+ mockito-target-minus-junit4 \
android-support-test
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/tests/view/Android.mk b/tests/tests/view/Android.mk
index d6100c8..8256643 100644
--- a/tests/tests/view/Android.mk
+++ b/tests/tests/view/Android.mk
@@ -32,7 +32,7 @@
android-support-test \
ctsdeviceutil \
ctstestrunner \
- mockito-target \
+ mockito-target-minus-junit4 \
platform-test-annotations \
ub-uiautomator
diff --git a/tests/tests/widget/Android.mk b/tests/tests/widget/Android.mk
index 3d4cead..5de6d34 100644
--- a/tests/tests/widget/Android.mk
+++ b/tests/tests/widget/Android.mk
@@ -23,7 +23,7 @@
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-test \
- mockito-target \
+ mockito-target-minus-junit4 \
android-common \
ctsdeviceutil \
ctstestrunner \