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

Commit 7bb96a6b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move resolv/dns_responder code to resolv/tests/"

parents 3bfb4b09 b43ec759

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ cc_test { 
    defaults: ["netd_defaults"],

    tidy: false,  // cuts test build time by > 1m30s

    srcs: [

        "dns_responder/dns_responder.cpp",

        "tests/dns_responder/dns_responder.cpp",

        "dnsresolver_binder_test.cpp",

        "resolver_test.cpp",

        "tests/resolv_test_utils.cpp",

dns_tls_test.cpp

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

#include "IDnsTlsSocketFactory.h"

#include "IDnsTlsSocketObserver.h"

#include "dns_responder/dns_tls_frontend.h"

#include "tests/dns_responder/dns_tls_frontend.h"



namespace android {

namespace net {

res_cache_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
#include <gmock/gmock-matchers.h>

#include <gtest/gtest.h>



#include "dns_responder/dns_responder.h"

#include "netd_resolv/stats.h"

#include "resolv_cache.h"

#include "resolv_private.h"

#include "tests/dns_responder/dns_responder.h"



using namespace std::chrono_literals;

resolver_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ 
#include "ResolverStats.h"

#include "android/net/IDnsResolver.h"

#include "binder/IServiceManager.h"

#include "dns_responder/dns_responder.h"

#include "dns_responder/dns_responder_client.h"

#include "dns_responder/dns_tls_frontend.h"

#include "netd_resolv/params.h"  // MAXNS

#include "netid_client.h"        // NETID_UNSET

#include "test_utils.h"

#include "tests/dns_metrics_listener/dns_metrics_listener.h"

#include "tests/dns_responder/dns_responder.h"

#include "tests/dns_responder/dns_responder_client.h"

#include "tests/dns_responder/dns_tls_frontend.h"

#include "tests/resolv_test_utils.h"



// Valid VPN netId range is 100 ~ 65535

dns_responder/Android.bp→tests/dns_responder/Android.bp

+0 −0

File moved.

View file