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

Commit ff064b1e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adjust to new androidx.test beta02 rules."

parents ef5741f9 91ba65df

services/tests/mockingservicestests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    frameworks-base-testutils \

    services.core \

    services.net \

    androidx-test \

    androidx.test.runner \

    mockito-target-extended-minus-junit4 \

    platform-test-annotations \

    ShortcutManagerTestUtils \

services/tests/servicestests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    services.net \

    services.usage \

    guava \

    androidx-test \

    androidx.test.runner \

    androidx.test.rules \

    mockito-target-minus-junit4 \

    platform-test-annotations \

    ShortcutManagerTestUtils \

services/tests/servicestests/test-apps/SuspendTestApp/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_COMPATIBILITY_SUITE := device-tests



LOCAL_STATIC_JAVA_LIBRARIES := androidx-test ub-uiautomator

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.runner ub-uiautomator



LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_SRC_FILES += ../../src/com/android/server/pm/SuspendPackagesTest.java

services/tests/wmtests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LOCAL_SRC_FILES := \ 
    $(call all-java-files-under, ../servicestests/utils)



LOCAL_STATIC_JAVA_LIBRARIES := \

    androidx-test \

    androidx.test.runner \

    mockito-target-minus-junit4 \

    platform-test-annotations \