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

Commit 34122c1d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Revert "Do not install tethering in TEST_MAPPING" 

This reverts commit b679b6a4.

Reason for revert:
Tethering was removed from test mapping during S development in some
branches, but is now usable gain in test mapping and needs to be part
of mainline-test-mapping testing.

Ignore-AOSP-First: Fixes difference with AOSP
Bug: 196755836
Change-Id: I1583c88257c197fa00e6c5bf273e83a70db26116
Test: TEST_MAPPING needs to be tested by treehugger
parent dfd9e8d0

TEST_MAPPING

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ 
    // We must specify at least one module here or the tests won't run. Use the same set as CTS

    // so in theory the infra would not need to reinstall/reboot devices to run both.

    {

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

      "name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]"

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

    }

  ],

  "mainline-postsubmit": [

tests/unit/Android.bp

+2 −8
Original line number Diff line number Diff line
@@ -56,10 +56,7 @@ android_test { 
    min_sdk_version: "29",

    srcs: [], // TODO: tests that only apply to the current, non-stable API can be added here

    test_suites: ["general-tests"],

    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"

    ],

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

    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiCurrentLib"],

    compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit
@@ -86,10 +83,7 @@ android_test { 
    min_sdk_version: "29",

    target_sdk_version: "30",

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

    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"

    ],

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

    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiStableLib"],

    compile_multilib: "both",