commit c1b4a1ec84318abed5ba14993698f49af2055147
author Ian Zerny <zerny@google.com> Fri Jun 25 12:06:13 2021 +0200
committer Ian Zerny <zerny@google.com> Fri Jun 25 12:06:27 2021 +0200
tree f36029c00d2414911b0519905bb20e9d780d58f0
parent bc6f5ae3c46a01c44a7713c7f7bb52ff21cc89aa

Move bootclasspath dependency out of static_libs.

Bug: 191747442
Test: atest FrameworksTelephonyTests
Change-Id: Icc8544673d58212e2a7973a74fe2ea0502d71576

testing/Android.bp

diff --git a/testing/Android.bp b/testing/Android.bp
index a5f9d7d..3c100d8 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -7,12 +7,15 @@
 
     srcs: ["**/*.java"],
 
+    libs: [
+        "telephony-common",
+    ],
+
     static_libs: [
         "androidx.annotation_annotation",
         "guava",
         "junit",
         "mockito-target-minus-junit4",
-        "telephony-common",
         "truth-prebuilt",
     ],
 

tests/telephonytests/Android.bp

diff --git a/tests/telephonytests/Android.bp b/tests/telephonytests/Android.bp
index fbda3c3..5b2e904 100644
--- a/tests/telephonytests/Android.bp
+++ b/tests/telephonytests/Android.bp
@@ -19,6 +19,7 @@
         "android.test.runner",
         "ims-common",
         "unsupportedappusage",
+        "telephony-common",
     ],
 
     static_libs: [
@@ -30,7 +31,6 @@
         "platform-test-annotations",
         "services.core",
         "services.net",
-        "telephony-common",
         "truth-prebuilt",
         "testables",
     ],