Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c98f27 authored by Luke Huang's avatar Luke Huang
Browse files

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
parent 579ddc7b

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ cc_library { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −3
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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"