commit c064abd0dbc625fb5baf778dc93f545724533aac
author markchien <markchien@google.com> Mon Oct 26 15:10:45 2020 +0800
committer Mark Chien <markchien@google.com> Mon Oct 26 09:52:13 2020 +0000
tree e284aa62db8791d4f36ee1159a1d10a1e1439fa0
parent e27ae93f77a3f7e8906561d4e9963a0de7a26a1c

Move jarjar rules from NetworkStaticTestsLib to NetworkStaticTests

jarjar should be applied on the final artifact (android_test,
android_app, java_library that goes into an apex), not on any
intermediate (android_library etc).

Bug: 171670016
Test: atest NetworkStaticTests
      atest TetheringCoverageTests
      atest NetworkCoverageTests
Change-Id: I86a15133112c555e08275efbde99e68315aa6bc2

staticlibs/tests/unit/Android.bp

diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp
index f18ffcf..199b8cc 100644
--- a/staticlibs/tests/unit/Android.bp
+++ b/staticlibs/tests/unit/Android.bp
@@ -6,7 +6,6 @@
     name: "NetworkStaticLibTestsLib",
     srcs: ["src/**/*.java","src/**/*.kt"],
     min_sdk_version: "29",
-    jarjar_rules: "jarjar-rules.txt",
     static_libs: [
         "net-utils-framework-common",
         "androidx.test.rules",
@@ -17,6 +16,7 @@
         "android.test.runner",
         "android.test.base",
     ],
+    jarjar_rules: "jarjar-rules-sharedlib.txt",
     visibility: [
         "//frameworks/base/packages/Tethering/tests/integration",
         "//packages/modules/NetworkStack/tests/integration",
@@ -29,6 +29,7 @@
     static_libs: [
         "NetworkStaticLibTestsLib",
     ],
+    jarjar_rules: "jarjar-rules.txt",
     test_suites: ["device-tests"],
 }
 

staticlibs/tests/unit/jarjar-rules-sharedlib.txt

diff --git a/staticlibs/tests/unit/jarjar-rules-sharedlib.txt b/staticlibs/tests/unit/jarjar-rules-sharedlib.txt
new file mode 100644
index 0000000..fceccfb
--- /dev/null
+++ b/staticlibs/tests/unit/jarjar-rules-sharedlib.txt
@@ -0,0 +1,6 @@
+# TODO: move the classes to the target package in java
+rule android.net.util.IpRange* com.android.net.module.util.IpRange@1
+rule android.net.util.MacAddressUtils* com.android.net.module.util.MacAddressUtils@1
+rule android.net.util.LinkPropertiesUtils* com.android.net.module.util.LinkPropertiesUtils@1
+rule android.net.util.NetUtils* com.android.net.module.util.NetUtils@1
+rule android.net.util.nsd.** com.android.net.module.util.nsd.@1

staticlibs/tests/unit/jarjar-rules.txt

diff --git a/staticlibs/tests/unit/jarjar-rules.txt b/staticlibs/tests/unit/jarjar-rules.txt
index 0f131b2..e032ae5 100644
--- a/staticlibs/tests/unit/jarjar-rules.txt
+++ b/staticlibs/tests/unit/jarjar-rules.txt
@@ -1,7 +1 @@
-# TODO: move the classes to the target package in java
-rule android.net.util.IpRange* com.android.net.moduletests.util.IpRange@1
-rule android.net.util.MacAddressUtils* com.android.net.moduletests.util.MacAddressUtils@1
-rule android.net.util.LinkPropertiesUtils* com.android.net.moduletests.util.LinkPropertiesUtils@1
-rule android.net.util.NetUtils* com.android.net.moduletests.util.NetUtils@1
-rule android.net.util.nsd.** com.android.net.moduletests.util.nsd.@1
 rule com.android.net.module.util.** com.android.net.moduletests.util.@1