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

Bug: 31072145
Test: make droid checkbuild

Change-Id: I7f2b13a4c28e51d76313ee3b6d13c904c2925228
---
 tests/app/Android.mk  | 2 +-
 tests/unit/Android.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index cd1338438db..04600887a31 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -9,7 +9,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target \
+    mockito-target-minus-junit4 \
     espresso-core
 
 # Include all test java files.
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 5b20173bbbc..ae1cc7256d1 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -9,7 +9,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target \
+    mockito-target-minus-junit4 \
     espresso-core
 
 # Include all test java files.