Merge "Remove android-support-test lib from testutils."

am: bc18cc9b19 Change-Id: I6931a899078460e8879b6c0f5b3dcb1f8d55b884
2019-03-11 16:51:41 -07:00
parent ab85849ce7 bc18cc9b19
commit 2a8c949988
2 changed files with 2 additions and 1 deletions
--- a/services/tests/servicestests/Android.bp
+++ b/services/tests/servicestests/Android.bp
@@ -28,6 +28,7 @@ android_test {
        "services.usage",
        "guava",
        "androidx.test.rules",
+        "hamcrest-library",
        "mockito-target-minus-junit4",
        "platform-test-annotations",
        "ShortcutManagerTestUtils",
--- a/tests/utils/testutils/Android.bp
+++ b/tests/utils/testutils/Android.bp
@@ -19,7 +19,7 @@ java_library {

    srcs: ["java/**/*.java"],

-    static_libs: ["android-support-test"],
+    static_libs: ["junit"],

    libs: [
        "android.test.runner",