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

Commit ffbc87e9 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Revert "Do not install tethering in TEST_MAPPING" am: 34122c1d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/15743563

Change-Id: Id7054547b7e63c72243d4caa91e78f89adc49607
parents a6d779e7 34122c1d
Loading
Loading
Loading
Loading
+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": [
+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",