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

Commit db04313f authored by Hungming Chen's avatar Hungming Chen Committed by android-build-merger
Browse files

Merge "Move resolv_test_utils into a library" am: 58659a6ffa am: 46bfc008aa... 

Merge "Move resolv_test_utils into a library" am: 58659a6ffa am: 46bfc008aa am: 2f56623256 am: 2575334e01
am: cfdc33bc23

Change-Id: I4da32d750de0e54e2d6449a0dfbd3e6b28ded69c
parents 3ef1b07d 406a2bae

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ cc_test { 
        "tests/dns_responder/dns_responder.cpp",

        "dnsresolver_binder_test.cpp",

        "resolver_test.cpp",

        "tests/resolv_test_utils.cpp",

    ],

    header_libs: [

        "libnetd_resolv_headers",
@@ -175,6 +174,7 @@ cc_test { 
        "libgmock",

        "libnetd_test_dnsresponder",

        "libnetd_test_metrics_listener",

        "libnetd_test_resolv_utils",

        "libnetd_test_tun_interface",

        "libnetd_test_utils",

        "libnetdutils",
@@ -199,7 +199,6 @@ cc_test { 
        "dns_tls_test.cpp",

        "libnetd_resolv_test.cpp",

        "res_cache_test.cpp",

        "tests/resolv_test_utils.cpp",

    ],

    shared_libs: [

        "libbase",
@@ -212,6 +211,7 @@ cc_test { 
        "libgmock",

        "libnetd_resolv",

        "libnetd_test_dnsresponder",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libprotobuf-cpp-lite",

        "server_configurable_flags",

tests/Android.bp

+22 −1
Original line number Diff line number Diff line 
cc_test_library {

    name: "libnetd_test_resolv_utils",

    defaults: ["netd_defaults"],

    srcs: [

        "resolv_test_utils.cpp",

    ],

    header_libs: [

        "libnetd_resolv_headers",

        "libnetd_resolv_internal_headers",

    ],

    shared_libs: [

        "libbase",

        "libutils",

    ],

    static_libs: [

        "libnetd_test_dnsresponder",

        "libnetdutils",

        "dnsresolver_aidl_interface-V2-cpp",

    ],

}



cc_test {

    name: "resolv_stress_test",

    test_suites: ["device-tests"],
@@ -7,7 +28,6 @@ cc_test { 
    defaults: ["netd_defaults"],

    srcs: [

        "resolv_stress_test.cpp",

        "resolv_test_utils.cpp",

    ],

    header_libs: [

        "libnetd_resolv_headers",
@@ -22,6 +42,7 @@ cc_test { 
    static_libs: [

        "libgmock",

        "libnetd_test_dnsresponder",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "netd_aidl_interface-V2-cpp",

        "dnsresolver_aidl_interface-V2-cpp",