Fix WmTests presubmit failure

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

Test: presubmit pass
Change-Id: If3f6d7a2ac52d3e8f72e9cbc88e54f0c4d4c47ce
This commit is contained in:
Louis Chang
2019-12-10 17:08:49 +08:00
parent 7983905878
commit f0385c5ad3
2 changed files with 10 additions and 2 deletions

View File

@@ -13,7 +13,7 @@ android_test {
],
static_libs: [
"frameworks-base-testutils",
"frameworks-base-testutils-minus-mockito",
"services.core",
"androidx.test.runner",
"androidx.test.rules",

View File

@@ -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: [