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

Commit 3b12bc1f authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master

parents e772785d ad8ce75b

Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,8 @@ cc_library_headers { 




cc_library_headers {

cc_library_headers {

    name: "dnsproxyd_protocol_headers",

    name: "dnsproxyd_protocol_headers",

    sdk_version: "29",

    min_sdk_version: "29",

    export_include_dirs: ["include/dnsproxyd_protocol"],

    export_include_dirs: ["include/dnsproxyd_protocol"],

    apex_available: [

    apex_available: [

        "//apex_available:platform",

        "//apex_available:platform",
@@ -85,6 +87,7 @@ aidl_interface { 
                "com.android.tethering",

                "com.android.tethering",

                "com.android.wifi",

                "com.android.wifi",

            ],

            ],

            min_sdk_version: "30",

        },

        },

        ndk: {

        ndk: {

            gen_log: true,

            gen_log: true,

TEST_MAPPING

+6 −5
Original line number Original line Diff line number Diff line
@@ -8,10 +8,11 @@ 
        { "name": "resolv_stats_test_utils_test" }

        { "name": "resolv_stats_test_utils_test" }

    ],

    ],

    "mainline-presubmit": [

    "mainline-presubmit": [

        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        // TODO: add back the tethering module when it is updatable in this branch

        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" }

        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" }

    ]

    ]

}
 
}

apex/manifest.json

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

{

  "name": "com.android.resolv",

  "name": "com.android.resolv",

  "version": 309999900

  "version": 319999900

}
 
}

resolv_test_config_template.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
<configuration description="Configuration for {MODULE} tests">

<configuration description="Configuration for {MODULE} tests">

   <option name="test-suite-tag" value="mts" />

   <option name="test-suite-tag" value="mts" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />

   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

       <option name="cleanup" value="true" />

       <option name="cleanup" value="true" />

tests/Android.bp

+4 −1
Original line number Original line Diff line number Diff line
@@ -276,7 +276,10 @@ cc_test { 
    ],

    ],

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

    defaults: ["netd_defaults", "resolv_test_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"],

    test_mainline_modules: [

        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex",

        "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",