diff options
| -rw-r--r-- | services/tests/mockingservicestests/Android.mk | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/Android.mk | 3 | ||||
| -rw-r--r-- | services/tests/servicestests/test-apps/SuspendTestApp/Android.mk | 2 | ||||
| -rw-r--r-- | services/tests/wmtests/Android.mk | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/services/tests/mockingservicestests/Android.mk b/services/tests/mockingservicestests/Android.mk index b83a79fc232c..e6cbb5badb9e 100644 --- a/services/tests/mockingservicestests/Android.mk +++ b/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 \ diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 2957267d2e5b..878179bb251d 100644 --- a/services/tests/servicestests/Android.mk +++ b/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 \ diff --git a/services/tests/servicestests/test-apps/SuspendTestApp/Android.mk b/services/tests/servicestests/test-apps/SuspendTestApp/Android.mk index 7e7decfa8e3b..ab222b941e94 100644 --- a/services/tests/servicestests/test-apps/SuspendTestApp/Android.mk +++ b/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 diff --git a/services/tests/wmtests/Android.mk b/services/tests/wmtests/Android.mk index 0f8b18ab92cf..c095ae0dd2ff 100644 --- a/services/tests/wmtests/Android.mk +++ b/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 \ |