From 079b2f342cbcd40532d9c7f7f0e82e0d0e06c81e Mon Sep 17 00:00:00 2001
From: Mitchell Wills <mwills@google.com>
Date: Thu, 28 Jul 2016 17:04:38 -0700
Subject: [PATCH] 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 d3868cfc63cd814e43367586f5706f39ec1cd5a9)
---
 tests/utils/testutils/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/utils/testutils/Android.mk b/tests/utils/testutils/Android.mk
index d53167f19ebe6..4bfd234260ba3 100644
--- a/tests/utils/testutils/Android.mk
+++ b/tests/utils/testutils/Android.mk
@@ -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)