commit 3e64aa182fef7af15f62a937b0e2aebcc218d977
author Jooyung Han <jooyung@google.com> Wed Nov 27 15:36:29 2019 +0900
committer Jooyung Han <jooyung@google.com> Wed Nov 27 16:22:46 2019 +0900
tree 09cc16a11daa523133cbc3ad42a3172a87e6dca9
parent 071fc8b80a5fa8d25d8ee40a7d688b8beefa330b

Use stubs generated by build system

instead of hand-crafted stub for libnetd_resolv apex.

Bug: N/A
Test: m && flash && boot
Test: adb shell ldd /system/bin/netd # shows libnetd_resolv.so from apex
Change-Id: I0eefe1fb2bfef70489c32fd075a11cef538e048b

server/Android.bp

diff --git a/server/Android.bp b/server/Android.bp
index c1705d6..1bea8a0 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -102,9 +102,6 @@
         "netd_aidl_interface-cpp",
         "netd_event_listener_interface-cpp",
     ],
-    header_libs: [
-        "libnetd_resolv_headers",
-    ],
     aidl: {
         export_aidl_headers: true,
         local_include_dirs: ["binder"],
@@ -131,6 +128,7 @@
         "libjsoncpp",
         "liblog",
         "libmdnssd",
+        "libnetd_resolv",
         "libnetdbpf",
         "libnetdutils",
         "libnetutils",
@@ -147,9 +145,6 @@
     static_libs: [
         "libnetd_server",
     ],
-    header_libs: [
-        "libnetd_resolv_headers",
-    ],
     srcs: [
         "DummyNetwork.cpp",
         "EventReporter.cpp",
@@ -166,7 +161,6 @@
         "PhysicalNetwork.cpp",
         "PppController.cpp",
         "Process.cpp",
-        "ResolvStub.cpp",
         "VirtualNetwork.cpp",
         "main.cpp",
         "oem_iptables_hook.cpp",