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/NetworkController.cpp

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index e490a9f..3e428ff 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -30,7 +30,6 @@
 #include <android-base/strings.h>
 #include <cutils/misc.h>  // FIRST_APPLICATION_UID
 #include <netd_resolv/resolv.h>
-#include <netd_resolv/resolv_stub.h>
 #include "log/log.h"
 
 #include "Controllers.h"
@@ -213,8 +212,7 @@
         // servers (through the default network). Otherwise, the query is guaranteed to fail.
         // http://b/29498052
         Network *network = getNetworkLocked(*netId);
-        if (network && network->getType() == Network::VIRTUAL &&
-            !RESOLV_STUB.resolv_has_nameservers(*netId)) {
+        if (network && network->getType() == Network::VIRTUAL && !resolv_has_nameservers(*netId)) {
             *netId = mDefaultNetId;
         }
     } else {
@@ -223,7 +221,7 @@
         // them). Otherwise, use the default network's DNS servers.
         // TODO: Consider if we should set the explicit bit here.
         VirtualNetwork* virtualNetwork = getVirtualNetworkForUserLocked(uid);
-        if (virtualNetwork && RESOLV_STUB.resolv_has_nameservers(virtualNetwork->getNetId())) {
+        if (virtualNetwork && resolv_has_nameservers(virtualNetwork->getNetId())) {
             *netId = virtualNetwork->getNetId();
         } else {
             // TODO: return an error instead of silently doing the DNS lookup on the wrong network.