commit 8d1a96d9eacd8713f2d42272984d050eda0f85f7
author Remi NGUYEN VAN <reminv@google.com> Tue Mar 23 10:50:45 2021 +0000
committer Remi NGUYEN VAN <reminv@google.com> Tue Jun 01 18:40:06 2021 +0900
tree 9afc84c505aefff117bd2c58dc2ccf75d13e1a95
parent a5e1148a4bc7cfb6dc8ede8ef98f3a34a716a917

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.

Original change (project moved):
I2e7b78263f7ca0cab9458854858a7423f6bd2854

Bug: 171540887
Test: atest CtsNetTestCases (in particular MultinetworkApiTest,
          DnsResolverTest, NetworkTest)
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I7a523aac93094beef6ff40d50678c12fe8840940

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index 1f0303c..2a03b73 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -108,10 +108,8 @@
         "-Wthread-safety",
     ],
     shared_libs: [
-        "libbase",
         "liblog",
         "libnativehelper",
-        "libnetd_client",
     ],
     header_libs: [
         "dnsproxyd_protocol_headers",
@@ -135,10 +133,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",