commit c12af098cdebb1ba34e9e1b262145f8091d44260
author Luke Huang <huangluke@google.com> Thu May 28 15:39:52 2020 +0800
committer Maciej Żenczykowski <maze@google.com> Sat May 30 19:05:11 2020 -0700
tree 551981efb55be6a6206269cae15dda57da111709
parent da74b8d0383307d462336e350569575bde5bf7a4

Use dnsproxyd_protocol_headers instead of libnetd_client_headers for NETID_USE_LOCAL_NAMESERVERS

NETID_USE_LOCAL_NAMESERVERS is no longer in libnetd_client_headers

Bug: 151895202
Test: build
Change-Id: I064f60fa4edf5a1b2ad7f8a127ab531f0ab0c52c
Merged-In: I064f60fa4edf5a1b2ad7f8a127ab531f0ab0c52c

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"