From 1eebfa3d87870f44a068c07113dd43b5b38ab6af Mon Sep 17 00:00:00 2001
From: Luke Huang <huangluke@google.com>
Date: Sat, 20 Jun 2020 11:49:40 +0800
Subject: [PATCH] Add net-utils-framework-common to cts-net

In order to avoid class package missing problem, add
net-utils-framework-common in cts net test build. Also jarjar
the package name to prevent conflict.

Test: build
Test: atest DnsResolverTest
Bug: 150952393
(clean cherry-pick from internal branch)
Merged-In: I40e2d4c4945a0579f6e1923e4722b09354ff050c
Change-Id: I40e2d4c4945a0579f6e1923e4722b09354ff050c
---
 tests/cts/net/Android.bp              | 7 ++++---
 tests/cts/net/jarjar-rules-shared.txt | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 tests/cts/net/jarjar-rules-shared.txt

diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index 052ab263d2..1ede5f75f9 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -36,19 +36,20 @@ java_defaults {
         "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",
     ],
 
diff --git a/tests/cts/net/jarjar-rules-shared.txt b/tests/cts/net/jarjar-rules-shared.txt
new file mode 100644
index 0000000000..11dba74096
--- /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