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:
@@ -13,7 +13,7 @@ android_test {
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"frameworks-base-testutils",
|
||||
"frameworks-base-testutils-minus-mockito",
|
||||
"services.core",
|
||||
"androidx.test.runner",
|
||||
"androidx.test.rules",
|
||||
|
||||
@@ -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: [
|
||||
|
||||
Reference in New Issue
Block a user