commit 7b91e6e0d62457e4ed45f32b878fac68f0772f5e
author Luke Huang <huangluke@google.com> Wed Jun 24 18:53:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 24 18:53:29 2020 +0000
tree 8acce32f0fe1e53267f8e84ffb43a6960997f554
parent 2ba91a70c6083c2c0729ac2cea92b062349a46f8
parent 10fa0790d9b2e74babbb9c631e21950ac3161b4f

Merge "Add net-utils-framework-common to cts-net" am: 10fa0790d9

Original change: https://android-review.googlesource.com/c/platform/cts/+/1348526

Change-Id: I1fcebc37c5585e8e5d21662b6b97e052f1c01e16

tests/cts/net/Android.bp

diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index 052ab26..1ede5f7 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -36,19 +36,20 @@
         "src/**/*.java",
         "src/**/*.kt",
     ],
-
+    jarjar_rules: "jarjar-rules-shared.txt",
     static_libs: [
         "FrameworksNetCommonTests",
         "TestNetworkStackLib",
-        "core-tests-support",
         "compatibility-device-util-axt",
+        "core-tests-support",
         "cts-net-utils",
         "ctstestrunner-axt",
         "ctstestserver",
-        "mockwebserver",
         "junit",
         "junit-params",
         "libnanohttpd",
+        "mockwebserver",
+        "net-utils-framework-common",
         "truth-prebuilt",
     ],
 

tests/cts/net/jarjar-rules-shared.txt

diff --git a/tests/cts/net/jarjar-rules-shared.txt b/tests/cts/net/jarjar-rules-shared.txt
new file mode 100644
index 0000000..11dba74
--- /dev/null
+++ b/tests/cts/net/jarjar-rules-shared.txt
@@ -0,0 +1,2 @@
+# Module library in frameworks/libs/net
+rule com.android.net.module.util.** android.net.cts.util.@1
\ No newline at end of file