diff options
| author | Louis Chang <louischang@google.com> | 2019-12-10 17:08:49 +0800 |
|---|---|---|
| committer | Louis Chang <louischang@google.com> | 2019-12-10 18:33:57 +0800 |
| commit | f0385c5ad344eb730cf36046771b84fbac94b51d (patch) | |
| tree | 361628cd49b0d84ca116194c8179568eadbacd7f | |
| parent | 79839058789a962565d694f9c708c641a2b54972 (diff) | |
Fix WmTests presubmit failure
Adding another library that excludes mockito for WmTests to avoid
conflicting with extended-mockito.
Test: presubmit pass
Change-Id: If3f6d7a2ac52d3e8f72e9cbc88e54f0c4d4c47ce
| -rw-r--r-- | services/tests/wmtests/Android.bp | 2 | ||||
| -rw-r--r-- | 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 cdba9a10fa82..cd4f0daa8ebc 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 027b1d6799fd..e13f906cdccd 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: [ |