diff options
| author | 2017-03-17 15:32:02 +0000 | |
|---|---|---|
| committer | 2017-03-17 15:32:07 +0000 | |
| commit | edd694e4bf584d933028c9ef02199c36a9729690 (patch) | |
| tree | 022a0fbdbaf08bcfe82dbac289a1b087704ef045 | |
| parent | a83ebca65156e8a61c15e4a10cd8f66b53ae09ef (diff) | |
| parent | a7773c2fb1aa168ba57b2bb12b300b11ff5f0a66 (diff) | |
Merge "Change dependency to standard mockito-target-minus-junit4"
| -rw-r--r-- | packages/SystemUI/tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/testables/Android.mk | 2 | ||||
| -rw-r--r-- | 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 |