commit df6b2f6989f2ce7ede7fca00b1e0cfcbcdc1f0a3
author Ian Kasprzak <iankaz@google.com> Fri Mar 08 18:49:31 2019 -0800
committer Ian Kasprzak <iankaz@google.com> Mon Mar 11 20:09:29 2019 +0000
tree 5e712e5b7619dc10b121ad704d9b565638ecec4c
parent bee0cbe5df04d56d0e66ae2deb28b650fb0b26fe

Remove android-support-test lib from testutils.

Fixed dependencies as needed.

Fixes apct/net/networking_framework_unit_test broken
in aosp/919393.

Test: m tests, checkbuild and Forrest (via gerritt) testing
Bug: 127910239

Change-Id: Ida0ca8012ede9227d204935b11002ddfa2f134ff
Merged-In: Ia825e0926b46855f9056739441cb21a065692076
(Manual partial cherry-pick of ec6bcbceee8fed0f99d1d5d1760b74eead98668a)

services/tests/servicestests/Android.bp

diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp
index d148ea1..9097430 100644
--- a/services/tests/servicestests/Android.bp
+++ b/services/tests/servicestests/Android.bp
@@ -28,6 +28,7 @@
         "services.usage",
         "guava",
         "androidx.test.rules",
+        "hamcrest-library",
         "mockito-target-minus-junit4",
         "platform-test-annotations",
         "ShortcutManagerTestUtils",

tests/utils/testutils/Android.bp

diff --git a/tests/utils/testutils/Android.bp b/tests/utils/testutils/Android.bp
index 4be6534..0a9e964 100644
--- a/tests/utils/testutils/Android.bp
+++ b/tests/utils/testutils/Android.bp
@@ -19,7 +19,7 @@
 
     srcs: ["java/**/*.java"],
 
-    static_libs: ["android-support-test"],
+    static_libs: ["junit"],
 
     libs: [
         "android.test.runner",