From d15b25ba43c296a54e6cfdaf106612349ac5a588 Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Wed, 24 Aug 2016 10:49:23 -0700
Subject: Avoid JUnit4 collision in android-support-test, mockito-target

Bug: 31072145
Test: make droid checkbuild

Change-Id: I257899fe815855d8cb9763693063b559d5038fb8
---
 tests/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index 07f4f00d9..910d89376 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -17,7 +17,7 @@ src_dirs := src \
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 
 LOCAL_STATIC_JAVA_LIBRARIES += \
-        mockito-target
+        mockito-target-minus-junit4
 
 LOCAL_PACKAGE_NAME := DialerTests
 
-- 
cgit v1.2.3