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

services/tests/mockingservicestests/Android.mk

@@ -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

@@ -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

@@ -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

@@ -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 \