commit f4c98f2771b0737aba236dae77715fc0fd6183e6
author Luke Huang <huangluke@google.com> Fri Jun 14 01:57:00 2019 +0800
committer Luke Huang <huangluke@google.com> Fri Jun 14 06:46:18 2019 +0000
tree 38efddcff0a109fb110b71540b79e1dc96be0c37
parent 579ddc7b8bc74d23618b8cd0e7f1043d17fa3009

Use header_libs instead of include_dirs for resolv

include libnetd_client_headers explicitly

Bug: 135235267
Test: m
      cd system/netd && atest

Change-Id: Iaeff2072ad0dcab8e42429cc4ae21f2dc3618004

Android.bp

diff --git a/Android.bp b/Android.bp
index 6757156..0b14ffe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -80,8 +80,8 @@
     shared_libs: [
         "libbinder_ndk",
     ],
-    include_dirs: [
-        "system/netd/include",
+    header_libs: [
+        "libnetd_client_headers",
     ],
     export_include_dirs: ["include"],
     // TODO: pie in the sky: make this code clang-tidy clean

Dns64Configuration.cpp

diff --git a/Dns64Configuration.cpp b/Dns64Configuration.cpp
index 870feea..dc4b021 100644
--- a/Dns64Configuration.cpp
+++ b/Dns64Configuration.cpp
@@ -24,6 +24,7 @@
 #include <netdutils/BackoffSequence.h>
 #include <netdutils/DumpWriter.h>
 #include <netdutils/InternetAddresses.h>
+#include <netid_client.h>
 #include <thread>
 #include <utility>
 
@@ -32,7 +33,6 @@
 #include "DnsResolver.h"
 #include "getaddrinfo.h"
 #include "netd_resolv/resolv.h"
-#include "netid_client.h"
 
 namespace android {
 

DnsProxyListener.cpp

diff --git a/DnsProxyListener.cpp b/DnsProxyListener.cpp
index 4e4a275..0629b7d 100644
--- a/DnsProxyListener.cpp
+++ b/DnsProxyListener.cpp
@@ -35,6 +35,7 @@
 #include <list>
 #include <vector>
 
+#include <NetdClient.h>  // NETID_USE_LOCAL_NAMESERVERS
 #include <android-base/stringprintf.h>
 #include <android/multinetwork.h>  // ResNsendFlags
 #include <cutils/misc.h>           // FIRST_APPLICATION_UID
@@ -49,7 +50,6 @@
 #include <sysutils/SocketClient.h>
 
 #include "DnsResolver.h"
-#include "NetdClient.h"  // NETID_USE_LOCAL_NAMESERVERS
 #include "NetdPermissions.h"
 #include "PrivateDnsConfiguration.h"
 #include "ResolverEventReporter.h"

DnsResolverService.cpp

diff --git a/DnsResolverService.cpp b/DnsResolverService.cpp
index 1ac467f..8319832 100644
--- a/DnsResolverService.cpp
+++ b/DnsResolverService.cpp
@@ -21,19 +21,17 @@
 #include <set>
 #include <vector>
 
+#include <BinderUtil.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
-#include <json/value.h>
-#include <json/writer.h>
 #include <log/log.h>
 #include <netdutils/DumpWriter.h>
 #include <netdutils/NetworkConstants.h>  // SHA256_SIZE
 #include <openssl/base64.h>
 #include <private/android_filesystem_config.h>  // AID_SYSTEM
 
-#include "BinderUtil.h"
 #include "DnsResolver.h"
 #include "NetdPermissions.h"  // PERM_*
 #include "ResolverEventReporter.h"

ResolverController.cpp

diff --git a/ResolverController.cpp b/ResolverController.cpp
index e16ca69..2ceeba7 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -24,13 +24,13 @@
 
 #include <netdb.h>
 
+#include <Fwmark.h>
 #include <aidl/android/net/IDnsResolver.h>
 #include <android-base/logging.h>
 #include <android-base/strings.h>
 
 #include "Dns64Configuration.h"
 #include "DnsResolver.h"
-#include "Fwmark.h"
 #include "PrivateDnsConfiguration.h"
 #include "ResolverEventReporter.h"
 #include "ResolverStats.h"