commit f3f98c24e9b6724b97032ee6c41f0492b5d0c8bc
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 22 12:56:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 12:56:37 2020 +0000
tree b0ad68121ba8bf2851d31c2997543cf1979ce471
parent b96b58b7fc8c7e7305954ca9da7247bd5b4bb108
parent 6261d27a9f5c8a30d2a1afb089bb66794e9b0bce

Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e

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

Change-Id: Ia635f839526ee28bc7a5533778b50c34063298df

tests/cts/net/Android.bp

diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index 2b99a40..112799b 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