Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7773c2f authored Mar 14, 2017 by Paul Duffin

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

parent 089efe43

packages/SystemUI/tests/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 \

tests/testables/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

tests/testables/tests/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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