diff options
| author | Ram Muthiah <rammuthiah@google.com> | 2019-12-11 17:37:00 -0800 |
|---|---|---|
| committer | Ram Muthiah <rammuthiah@google.com> | 2019-12-11 17:37:00 -0800 |
| commit | a4bb0444d90fe736dd47267189e406ab1321dbc9 (patch) | |
| tree | 2e9040a354677f0a1670525755febc10b4097b4f | |
| parent | d006065a66761626ff515d35fa601946eaf875eb (diff) | |
Revert "Fix WmTests presubmit failure"
This reverts commit f0385c5ad344eb730cf36046771b84fbac94b51d.
Bug: 146018363
Test: Treehugger
| -rw-r--r-- | services/tests/wmtests/Android.bp | 2 | ||||
| -rw-r--r-- | tests/utils/testutils/Android.bp | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/services/tests/wmtests/Android.bp b/services/tests/wmtests/Android.bp index cd4f0daa8ebc..cdba9a10fa82 100644 --- a/services/tests/wmtests/Android.bp +++ b/services/tests/wmtests/Android.bp @@ -13,7 +13,7 @@ android_test { ], static_libs: [ - "frameworks-base-testutils-minus-mockito", + "frameworks-base-testutils", "services.core", "androidx.test.runner", "androidx.test.rules", diff --git a/tests/utils/testutils/Android.bp b/tests/utils/testutils/Android.bp index e13f906cdccd..027b1d6799fd 100644 --- a/tests/utils/testutils/Android.bp +++ b/tests/utils/testutils/Android.bp @@ -17,15 +17,6 @@ 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", @@ -35,6 +26,7 @@ java_library { "junit", "hamcrest-library", "truth-prebuilt", + "mockito-target-minus-junit4", ], libs: [ |