Apply jarjar rules to NetworkStaticLibTests

Each test target in NetworkStackCoverageTests needs to have appropriate
jarjar rules applied: this was not the case for NetworkStaticLibTests,
even though jarjar rules are already applied in NetworkStackTests and
NetworkStackIntegrationTests.

NetworkStaticLib is used by multiple modules that are each supposed to
jarjar it to their own package, so jarjar rules cannot be applied on the
test target itself.
Define an android library to apply the jarjar rules before including the
tests into NetworkStaticLibTests.

Bug: 152461494
Test: atest NetworkStackCoverageTests

Change-Id: I2afebd0e0fbfde2ed8c9daa396077761db23409f

1 files changed, 13 insertions, 1 deletions

diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index 1a985a9..af63f0e 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -82,6 +82,18 @@ android_test {
     test_suites: ["device-tests"],
 }
 
+// The static lib needs to be jarjared by each module so they do not conflict with each other
+// (e.g. wifi, system server, network stack need to use different package names when including it).
+// Apply NetworkStack jarjar rules to the tests as well so classes in NetworkStaticLibTests have the
+// same package names as in module code.
+android_library {
+    name: "NetworkStackStaticLibTestsLib",
+    platform_apis: true,
+    min_sdk_version: "29",
+    jarjar_rules: ":NetworkStackJarJarRules",
+    static_libs: ["NetworkStaticLibTestsLib"],
+}
+
 // Special version of the network stack tests that includes all tests necessary for code coverage
 // purposes. This is currently the union of NetworkStackTests and NetworkStackIntegrationTests.
 android_test {
@@ -95,7 +107,7 @@ android_test {
     static_libs: [
         "NetworkStackTestsLib",
         "NetworkStackIntegrationTestsLib",
-        "NetworkStaticLibTestsLib",
+        "NetworkStackStaticLibTestsLib",
     ],
     compile_multilib: "both",
     manifest: "AndroidManifest_coverage.xml",