commit 6b0c4071332139a8eca10c5738d0c2b0818b4fef
author Remi NGUYEN VAN <reminv@google.com> Tue Mar 23 10:50:45 2021 +0000
committer Remi NGUYEN VAN <reminv@google.com> Wed Mar 24 10:08:39 2021 +0000
tree 727b039c2b4cfb9bbd6aa08a75bd75870456e052
parent 4f591c39101d7cff56104d3fd18026964a0a2c30

Remove dependency on libnetd_client

NetworkUtils can just use the NDK to achieve the same.

Also make sure network handles can have the local nameservers flag, for
the JNI API, and create/parse them accordingly in Network.

Bug: 171540887
Test: atest CtsNetTestCases (in particular MultinetworkApiTest,
          DnsResolverTest, NetworkTest)
Change-Id: I2e7b78263f7ca0cab9458854858a7423f6bd2854

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index 3553c1f..b0965bb 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -112,10 +112,8 @@
         "-Wthread-safety",
     ],
     shared_libs: [
-        "libbase",
         "liblog",
         "libnativehelper",
-        "libnetd_client",
     ],
     header_libs: [
         "dnsproxyd_protocol_headers",
@@ -139,10 +137,10 @@
     name: "libframework-connectivity-jni",
     defaults: ["libframework-connectivity-defaults"],
     srcs: [
+        "jni/android_net_NetworkUtils.cpp",
         "jni/onload.cpp",
     ],
     shared_libs: ["libandroid"],
-    static_libs: ["libconnectivityframeworkutils"],
     apex_available: [
         "//apex_available:platform",
         "com.android.tethering",