Commit 079b2f34 authored Jul 28, 2016 by Mitchell Wills

Don't pull in external/junit through mockito

android-support-test provides a different version of junit

FIXED=30481239

Change-Id: I6d8f52d5f82b4c9905da8cc4a6ca79216eba9e26
(cherry picked from commit d3868cfc)

parent 47fb68bd

tests/utils/testutils/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java)

		LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-test \
		mockito-target
		mockito-target-minus-junit4

		include $(BUILD_STATIC_JAVA_LIBRARY)