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

Commit 46a18a46 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Get the mainline-presubmit modules from a defaults clause." am: 995c75fc 

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

Change-Id: I46a5eab20826ccde76362d822125c66d885e3a28
parents 56492f1e 995c75fc

tests/Android.bp

+5 −2
Original line number Original line Diff line number Diff line
@@ -275,9 +275,12 @@ cc_test { 
    srcs: [

    srcs: [

        "resolv_stats_test_utils_test.cpp",

        "resolv_stats_test_utils_test.cpp",

    ],

    ],

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

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

        "connectivity-mainline-presubmit-cc-defaults",

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

    test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],

    static_libs: [

    static_libs: [

        "libgmock",

        "libgmock",

        "libprotobuf-cpp-lite",

        "libprotobuf-cpp-lite",