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

Commit ed473ba7 authored by Aditya Choudhary's avatar Aditya Choudhary Committed by Automerger Merge Worker
Browse files

[DON'T BLOCK] Test ownership migration rules am: 2ca97ef7 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2941546



Change-Id: I2466cd1db2c76bc94977536dadc4fd46fe47409d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b59cd24a 2ca97ef7

Android.bp

+1 −0
Original line number Diff line number Diff line 
package {

    default_team: "trendy_team_fwk_core_networking",

    default_applicable_licenses: ["packages_modules_DnsResolver_license"],

}

apex/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.





package {

    default_team: "trendy_team_fwk_core_networking",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "packages_modules_DnsResolver_license"

doh/tests/doh_frontend/Android.bp

+1 −0
Original line number Diff line number Diff line 
package {

    default_team: "trendy_team_fwk_core_networking",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "packages_modules_DnsResolver_license"

tests/Android.bp

+42 −16
Original line number Diff line number Diff line 
package {

    default_team: "trendy_team_fwk_core_networking",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "packages_modules_DnsResolver_license"
@@ -9,7 +10,10 @@ package { 


cc_test_library {

    name: "libnetd_test_resolv_utils",

    defaults: ["netd_defaults", "resolv_test_defaults"],

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

    ],

    srcs: [

        "resolv_test_utils.cpp",

    ],
@@ -85,14 +89,20 @@ cc_library_static { 


cc_test {

    name: "resolv_gold_test",

    test_suites: ["general-tests", "mts-dnsresolver"],

    test_suites: [

        "general-tests",

        "mts-dnsresolver",

    ],

    isolated: false,

    require_root: true,

    // b/151392634, this is a workaround because MTS

    // can not handle the test with testdata correctly.

    // TODO: Remove the xml after MTS fixing the problem.

    test_config: "resolv_gold_test_config.xml",

    defaults: ["netd_defaults", "resolv_test_defaults"],

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

    ],

    data: [":resolv_gold_test_pbtxt2pb"],

    srcs: [

        "resolv_gold_test.cpp",
@@ -136,12 +146,19 @@ cc_test { 


cc_test {

    name: "resolv_stress_test",

    test_suites: ["general-tests", "mts-dnsresolver"],

    test_suites: [

        "general-tests",

        "mts-dnsresolver",

    ],

    isolated: false,

    // This won't work with test_config

    // require_root: true,

    // TODO: Remove resolv_test_mts_coverage_defaults after mts coverage switched to 64-bit device.

    defaults: ["netd_defaults", "resolv_test_defaults", "resolv_test_mts_coverage_defaults"],

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

        "resolv_test_mts_coverage_defaults",

    ],

    srcs: [

        "resolv_stress_test.cpp",

    ],
@@ -165,11 +182,17 @@ cc_test { 


cc_test {

    name: "resolv_integration_test",

    test_suites: ["general-tests", "mts-dnsresolver"],

    test_suites: [

        "general-tests",

        "mts-dnsresolver",

    ],

    isolated: false,

    require_root: true,

    test_config_template: ":resolv_test_config_template",

    defaults: ["netd_defaults", "resolv_test_defaults"],

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

    ],

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

    srcs: [

        "dns_responder/dns_responder.cpp",
@@ -228,7 +251,7 @@ cc_test { 
    // after the build process.

    host_required: [

        "net-tests-utils-host-common",

    ]

    ],

}



cc_test {
@@ -283,9 +306,12 @@ cc_test { 
cc_test_library {

    name: "resolv_stats_test_utils",

    srcs: [

        "resolv_stats_test_utils.cpp"

        "resolv_stats_test_utils.cpp",

    ],

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

    ],

    defaults: ["netd_defaults", "resolv_test_defaults"],

    export_include_dirs: ["."],

    static_libs: [

        "libgmock",

tests/dns_metrics_listener/Android.bp

+5 −1
Original line number Diff line number Diff line 
package {

    default_team: "trendy_team_fwk_core_networking",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "packages_modules_DnsResolver_license"
@@ -9,7 +10,10 @@ package { 


cc_test_library {

    name: "libnetd_test_metrics_listener",

    defaults: ["netd_defaults", "resolv_test_defaults"],

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

    ],

    srcs: [

        "base_metrics_listener.cpp",

        "dns_metrics_listener.cpp",