commit eccf0ff11b4d9d8f7d1bda9cd8f958805c41ac12
author Luke Huang <huangluke@google.com> Mon Jun 01 02:14:26 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 01 02:14:26 2020 +0000
tree 551981efb55be6a6206269cae15dda57da111709
parent 8a20c01a0ae300a85277536ddca8e52f2d752612
parent c12af098cdebb1ba34e9e1b262145f8091d44260

Use dnsproxyd_protocol_headers instead of libnetd_client_headers for NETID_USE_LOCAL_NAMESERVERS am: c12af098cd

Change-Id: I7504fdaf5f35a63862523f77aab37723b1216a09

Android.bp

diff --git a/Android.bp b/Android.bp
index ae4bf1d..8585780 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,7 +14,7 @@
     include_dirs: ["bionic/libc/dns/include"],
 
     // For NETID_USE_LOCAL_NAMESERVERS.
-    header_libs: ["libnetd_client_headers"],
+    header_libs: ["dnsproxyd_protocol_headers"],
 }
 
 // Code used both by the daemon and by unit tests.

dns64.c

diff --git a/dns64.c b/dns64.c
index 5ca85d9..66cb7dc 100644
--- a/dns64.c
+++ b/dns64.c
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "NetdClient.h"
+#include <DnsProxydProtocol.h>  // NETID_USE_LOCAL_NAMESERVERS
 #include "dns64.h"
 #include "logging.h"
 #include "resolv_netid.h"