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

Commit 0a7bbdb8 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Get the mainline-presubmit modules from a defaults clause. 

All our mainline presubmits have the same list of modules.
Instead of specifying them on each test that uses them, get the
list from a defaults clause to keep them consistent.

Test: treehugger
Change-Id: Ie30d42eab4f1dc4b103d12fb00c54612d100f808
parent 9dee53ba

tests/unit/Android.bp

+9 −4
Original line number Diff line number Diff line
@@ -56,8 +56,11 @@ 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+com.google.android.tethering.apex"],

    defaults: ["NetworkStackTestsDefaults", "NetworkStackNextEnableDefaults"],

    defaults: [

        "NetworkStackTestsDefaults",

        "NetworkStackNextEnableDefaults",

        "connectivity-mainline-presubmit-java-defaults",

    ],

    static_libs: ["NetworkStackApiCurrentLib"],

    compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit

    jarjar_rules: ":NetworkStackJarJarRules",
@@ -83,8 +86,10 @@ 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+com.google.android.tethering.apex"],

    defaults: ["NetworkStackTestsDefaults"],

    defaults: [

        "NetworkStackTestsDefaults",

        "connectivity-mainline-presubmit-java-defaults",

    ],

    static_libs: ["NetworkStackApiStableLib"],

    compile_multilib: "both",

    jarjar_rules: ":NetworkStackJarJarRules",