From f0385c5ad344eb730cf36046771b84fbac94b51d Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Tue, 10 Dec 2019 17:08:49 +0800
Subject: [PATCH] Fix WmTests presubmit failure

Adding another library that excludes mockito for WmTests to avoid
conflicting with extended-mockito.

Test: presubmit pass
Change-Id: If3f6d7a2ac52d3e8f72e9cbc88e54f0c4d4c47ce
---
 services/tests/wmtests/Android.bp |  2 +-
 tests/utils/testutils/Android.bp  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/services/tests/wmtests/Android.bp b/services/tests/wmtests/Android.bp
index cdba9a10fa823..cd4f0daa8ebcd 100644
--- a/services/tests/wmtests/Android.bp
+++ b/services/tests/wmtests/Android.bp
@@ -13,7 +13,7 @@ android_test {
     ],
 
     static_libs: [
-        "frameworks-base-testutils",
+        "frameworks-base-testutils-minus-mockito",
         "services.core",
         "androidx.test.runner",
         "androidx.test.rules",
diff --git a/tests/utils/testutils/Android.bp b/tests/utils/testutils/Android.bp
index 027b1d6799fda..e13f906cdccd0 100644
--- a/tests/utils/testutils/Android.bp
+++ b/tests/utils/testutils/Android.bp
@@ -17,6 +17,15 @@
 java_library {
     name: "frameworks-base-testutils",
 
+    static_libs: [
+        "frameworks-base-testutils-minus-mockito",
+        "mockito-target-minus-junit4",
+    ]
+}
+
+java_library {
+    name: "frameworks-base-testutils-minus-mockito",
+
     srcs: [
         "java/**/*.java",
         "java/**/*.kt",
@@ -26,7 +35,6 @@ java_library {
         "junit",
         "hamcrest-library",
         "truth-prebuilt",
-        "mockito-target-minus-junit4",
     ],
 
     libs: [