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

Commit 58444d3f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Reduce usage of internal headers in tests" am: f50e6106 am: beeb9420 am: 87d3745b 

Change-Id: I17a64b04b3d53c68ff5b0bf3e85c1a100bbb4f89
parents ea6dde14 87d3745b

Android.bp

+2 −5
Original line number Diff line number Diff line
@@ -3,11 +3,8 @@ cc_library_headers { 
    export_include_dirs: ["include"],

}



//For the test to use

//TODO: 1. Need to Refactor ResolverStats related code(ex: ResolverController::getDnsInfo).

//         Then removing this library header file.

//      2. Change the imports path in netd/TEST_MAPPING after migrating from

//         system/netd/resolv to packages/modules/resolv.

// Used only by dns_responder_client_ndk.cpp for ResolverStats.h

// TODO: refactor stats to use a Parcel and eliminate this dependency

cc_library_headers {

    name: "libnetd_resolv_internal_headers",

    export_include_dirs: ["."],

resolv_unit_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ using android::netdutils::ScopedAddrinfo; 
// The buffer size of resolv_gethostbyname().

constexpr unsigned int MAXPACKET = 8 * 1024;



// Specifying 0 in ai_socktype or ai_protocol of struct addrinfo indicates

// that any type or protocol can be returned by getaddrinfo().

constexpr unsigned int ANY = 0;



class TestBase : public ::testing::Test {

  protected:

    struct DnsMessage {

tests/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ cc_test_library { 
    ],

    header_libs: [

        "libnetd_resolv_headers",

        "libnetd_resolv_internal_headers",

    ],

    shared_libs: [

        "libbase",
@@ -41,7 +40,6 @@ cc_test { 
    ],

    header_libs: [

        "libnetd_client_headers",

        "libnetd_resolv_internal_headers",

    ],

    shared_libs: [

        "libbinder_ndk",
@@ -79,7 +77,6 @@ cc_test { 
    ],

    header_libs: [

        "libnetd_resolv_headers",

        "libnetd_resolv_internal_headers",

    ],

    shared_libs: [

        "libbase",
@@ -112,7 +109,6 @@ cc_test { 
    ],

    header_libs: [

        "libnetd_resolv_headers",

        "libnetd_resolv_internal_headers",

    ],

    // TODO: make static link libc++ work.

    //stl: "libc++_static",

tests/dns_responder/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ cc_library { 
        "libnetd_resolv_headers",

        "libnetd_resolv_internal_headers",

    ],

    export_header_lib_headers: [

        "libnetd_resolv_internal_headers",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "libbase",

tests/dns_responder/dns_responder_client_ndk.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


#include <aidl/android/net/IDnsResolver.h>

#include <aidl/android/net/INetd.h>

#include "ResolverStats.h"

#include "ResolverStats.h"  // TODO: stop depending on this internal header

#include "dns_responder.h"

#include "dns_tls_certificate.h"

#include "params.h"