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

Commit b2d15a6d authored by Ken Chen's avatar Ken Chen Committed by android-build-merger
Browse files

Merge "Move private headers out of /include folder" 

am: 6ba673b5

Change-Id: If9ea787bd45783eba8e5a57d05301e968eb058ac
parents 04e1725c 6ba673b5

DnsProxyListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ 
#include "ResolverEventReporter.h"

#include "getaddrinfo.h"

#include "gethnamaddr.h"

#include "netd_resolv/stats.h"  // RCODE_TIMEOUT

#include "res_send.h"

#include "resolv_cache.h"

#include "resolv_private.h"

#include "stats.h"  // RCODE_TIMEOUT

#include "stats.pb.h"



using aidl::android::net::metrics::INetdEventListener;

DnsTlsServer.h

+2 −5
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef _DNS_DNSTLSSERVER_H

#define _DNS_DNSTLSSERVER_H

#pragma once



#include <chrono>

#include <set>
@@ -24,7 +23,7 @@ 


#include <netinet/in.h>



#include <netd_resolv/params.h>

#include <params.h>



namespace android {

namespace net {
@@ -80,5 +79,3 @@ struct AddressComparator { 


}  // namespace net

}  // namespace android
 


#endif  // _DNS_DNSTLSSERVER_H

ResolverController.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
#include "PrivateDnsConfiguration.h"

#include "ResolverEventReporter.h"

#include "ResolverStats.h"

#include "netd_resolv/stats.h"

#include "resolv_cache.h"

#include "stats.h"



using aidl::android::net::ResolverParamsParcel;

include/netd_resolv/resolv.h

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 


#pragma once



#include "params.h"



#include <arpa/nameser.h>

#include <netinet/in.h>
@@ -120,6 +118,8 @@ struct ResolverNetdCallbacks { 


#define TAG_SYSTEM_DNS 0xFFFFFF82



#define LIBNETD_RESOLV_PUBLIC extern "C" [[gnu::visibility("default")]]



LIBNETD_RESOLV_PUBLIC bool resolv_has_nameservers(unsigned netid);



// Set callbacks and bring DnsResolver up.

include/netd_resolv/resolv_stub.h

+1 −5
Original line number Diff line number Diff line
@@ -26,11 +26,9 @@ 
 * SUCH DAMAGE.

 */



#ifndef NETD_RESOLV_RESOLV_STUB_H

#define NETD_RESOLV_RESOLV_STUB_H

#pragma once



#include "resolv.h"

#include "stats.h"



// Struct containing function pointers for every function exported by libnetd_resolv.

extern struct ResolvStub {
@@ -44,5 +42,3 @@ extern struct ResolvStub { 
} RESOLV_STUB;



int resolv_stub_init();
 


#endif  // NETD_RESOLV_RESOLV_STUB_H