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

Commit b43ec759 authored by chenbruce's avatar chenbruce
Browse files

Move resolv/dns_responder code to resolv/tests/ 

Bug: 137678422
Test: built, flashed, booted
Test: atest
Change-Id: I052eb4f9361e21fdef2a86dad17ff9b61902c3cd
parent c7649d11

Android.bp

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

    defaults: ["netd_defaults"],

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

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

    srcs: [

    srcs: [

        "dns_responder/dns_responder.cpp",

        "tests/dns_responder/dns_responder.cpp",

        "dnsresolver_binder_test.cpp",

        "dnsresolver_binder_test.cpp",

        "resolver_test.cpp",

        "resolver_test.cpp",

        "tests/resolv_test_utils.cpp",

        "tests/resolv_test_utils.cpp",

dns_tls_test.cpp

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

#include "IDnsTlsSocket.h"

#include "IDnsTlsSocketFactory.h"

#include "IDnsTlsSocketFactory.h"

#include "IDnsTlsSocketObserver.h"

#include "IDnsTlsSocketObserver.h"

#include "dns_responder/dns_tls_frontend.h"

#include "tests/dns_responder/dns_tls_frontend.h"





namespace android {

namespace android {

namespace net {

namespace net {

res_cache_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,10 +26,10 @@ 
#include <android-base/stringprintf.h>

#include <android-base/stringprintf.h>

#include <android/multinetwork.h>

#include <android/multinetwork.h>





#include "dns_responder/dns_responder.h"

#include "netd_resolv/stats.h"

#include "netd_resolv/stats.h"

#include "resolv_cache.h"

#include "resolv_cache.h"

#include "resolv_private.h"

#include "resolv_private.h"

#include "tests/dns_responder/dns_responder.h"





using namespace std::chrono_literals;

using namespace std::chrono_literals;

resolver_test.cpp

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

#include "ResolverStats.h"

#include "android/net/IDnsResolver.h"

#include "android/net/IDnsResolver.h"

#include "binder/IServiceManager.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 "netd_resolv/params.h"  // MAXNS

#include "netid_client.h"        // NETID_UNSET

#include "netid_client.h"        // NETID_UNSET

#include "test_utils.h"

#include "test_utils.h"

#include "tests/dns_metrics_listener/dns_metrics_listener.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"

#include "tests/resolv_test_utils.h"





// Valid VPN netId range is 100 ~ 65535

// Valid VPN netId range is 100 ~ 65535

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

+0 −0

File moved.

View file