commit 5fc809f799737a5b770fb2cf7a00247add159c9b
author Paul Duffin <paulduffin@google.com> Fri May 20 14:15:42 2022 +0000
committer Paul Duffin <paulduffin@google.com> Thu May 26 09:37:05 2022 +0000
tree 2d8bc1fffd049c7fc365f8cb8e1c97ef10137e68
parent 433f594bb6d51fe413a7630e8282badc5806755f

Workaround prebuilt name conflict for service-connectivity

(cherry picked from commit 4ceb8c1f255532921fd9b1ebcaf85eb1dd6693b7)

When building against prebuilts some dependencies on
service-connectivity get replaced by the prebuilts which does not have
an implementation library and so it breaks.

If it was a java_sdk_library that would be handled automatically but
it is just a java_library.

Bug: 223592962
Test: m FrameworksNetSmokeTests FrameworksNetTests FrameworksNetIntegrationTests
      # Fails when building from prebuilts without this change works with this change.
Merged-In: Ib2fbd3c7703e9ed606650643db6e1977f550d90d
Change-Id: Ib2fbd3c7703e9ed606650643db6e1977f550d90d

tests/integration/Android.bp

diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index 97c1265..b3684ac 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -71,7 +71,7 @@
         "net-tests-utils",
     ],
     libs: [
-        "service-connectivity",
+        "service-connectivity-for-tests",
         "services.core",
         "services.net",
     ],