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
diff --git a/server/main.cpp b/server/main.cpp
index cfbadee..b3408be 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -48,7 +48,6 @@
#include "Process.h"
#include "netd_resolv/resolv.h"
-#include "netd_resolv/resolv_stub.h"
using android::IPCThreadState;
using android::sp;
@@ -99,7 +98,7 @@
.tagSocket = &tagSocketCallback,
.evaluate_domain_name = &evaluateDomainNameCallback,
};
- return RESOLV_STUB.resolv_init(callbacks);
+ return resolv_init(&callbacks);
}
} // namespace
@@ -119,9 +118,6 @@
setCloseOnExec(sock);
}
- // Before we start any threads, populate the resolver stub pointers.
- resolv_stub_init();
-
// Make sure BPF programs are loaded before doing anything
while (!android::base::WaitForProperty("bpf.progs_loaded", "1",
std::chrono::seconds(5))) {