commit 082f1d8a97d2d33e9e3723ead205f508a183660a
author Aaron Huang <huangaaron@google.com> Fri Jan 08 18:32:00 2021 +0800
committer Aaron Huang <huangaaron@google.com> Wed Mar 10 22:25:45 2021 +0800
tree 12ac58935179155388f36b95b687922e68a347bb
parent 411d98802d33ffac596e84237022076532416875

Create a service-connectivity-pre-jarjar library

This is needed for FrameworksNetTests because it inculdes
service-connectivity. Without this library, the service-connectivity
is already jarjar-ed which will cause the util classes couldn't be
found when running the tests. So let the tests inculde the pre-jarjar
version and service-connectivity applies the jarjar to this library.

Bug: 177046265
Test: FrameworksNetTests
Change-Id: I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca
Merged-In: I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca

tests/net/Android.bp

diff --git a/tests/net/Android.bp b/tests/net/Android.bp
index 8122495..7f0318a 100644
--- a/tests/net/Android.bp
+++ b/tests/net/Android.bp
@@ -70,7 +70,7 @@
         "mockito-target-minus-junit4",
         "net-tests-utils",
         "platform-test-annotations",
-        "service-connectivity",
+        "service-connectivity-pre-jarjar",
         "services.core",
         "services.net",
     ],