From a7773c2fb1aa168ba57b2bb12b300b11ff5f0a66 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 14 Mar 2017 16:37:39 +0000 Subject: Change dependency to standard mockito-target-minus-junit4 The mockito-updated-target-minus-junit4 target was added because some tests needed a later version of mockito than was available through mockito-target-minus-junit4. Since the latter has now been upgraded to 2.7.13 that is no longer true and so users of mockito-updated-target-minus-junit4 can be switched to use mockito-target-minus-junit4 instead. Bug: 32912773 Test: make checkbuild && runtest systemui Change-Id: If7e4dd26d7d0e93731856e9739a048c89a835333 --- packages/SystemUI/tests/Android.mk | 2 +- tests/testables/Android.mk | 2 +- tests/testables/tests/Android.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 10ff8adc3180..ddd8d7b3002f 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -47,7 +47,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ metrics-helper-lib \ android-support-test \ - mockito-updated-target-minus-junit4 \ + mockito-target-minus-junit4 \ SystemUI-proto \ SystemUI-tags \ legacy-android-test \ diff --git a/tests/testables/Android.mk b/tests/testables/Android.mk index 58399fd5bc6c..759bc3555fa1 100644 --- a/tests/testables/Android.mk +++ b/tests/testables/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - mockito-updated-target-minus-junit4 \ + mockito-target-minus-junit4 \ legacy-android-test LOCAL_JAVA_LIBRARIES := android.test.runner diff --git a/tests/testables/tests/Android.mk b/tests/testables/tests/Android.mk index 752d536ae4c6..a123d801ed5a 100644 --- a/tests/testables/tests/Android.mk +++ b/tests/testables/tests/Android.mk @@ -27,7 +27,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - mockito-updated-target-minus-junit4 \ + mockito-target-minus-junit4 \ legacy-android-test \ testables -- cgit v1.2.3-59-g8ed1b