Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0385c5a authored by Louis Chang's avatar Louis Chang
Browse files

Fix WmTests presubmit failure 

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

Test: presubmit pass
Change-Id: If3f6d7a2ac52d3e8f72e9cbc88e54f0c4d4c47ce
parent 79839058

services/tests/wmtests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ android_test { 
    ],



    static_libs: [

        "frameworks-base-testutils",

        "frameworks-base-testutils-minus-mockito",

        "services.core",

        "androidx.test.runner",

        "androidx.test.rules",

tests/utils/testutils/Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -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: [