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

Commit 09c18c17 authored by Cole Faust's avatar Cole Faust
Browse files

Remove dependencies on the 1-variant fallback 

When adding a dependencies, if the variants don't match, but the
dependency only has 1 variant anyways, soong will always use that
variant. This makes it hard to add new variants to soong, because the
1-variant fallback stops being used and you start getting missing
variant errors. Make changes to bp files such that all dependencies
correctly specify the variant to use.

Bug: 372091092
Flag: EXEMPT refactor
Test: m nothing
Change-Id: I35a5ac0e6b63080f692be6597edf5f213c4e7acb
parent 2307e47e

debuggerd/test_permissive_mte/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ java_test_host { 
        "src/**/PermissiveMteTest.java",

        ":libtombstone_proto-src",

    ],

    data: [":mte_crash"],

    device_first_data: [":mte_crash"],

    test_config: "AndroidTest.xml",

    test_suites: ["general-tests"],

}

init/test_upgrade_mte/Android.bp

+22 −13
Original line number Diff line number Diff line
@@ -33,9 +33,18 @@ cc_binary { 
java_test_host {

    name: "mte_upgrade_test",

    libs: ["tradefed"],

    static_libs: ["frameworks-base-hostutils", "cts-install-lib-host"],

    srcs:  ["src/**/MteUpgradeTest.java", ":libtombstone_proto-src"],

    data: [":mte_upgrade_test_helper", "mte_upgrade_test.rc" ],

    static_libs: [

        "frameworks-base-hostutils",

        "cts-install-lib-host",

    ],

    srcs: [

        "src/**/MteUpgradeTest.java",

        ":libtombstone_proto-src",

    ],

    device_first_data: [

        ":mte_upgrade_test_helper",

        "mte_upgrade_test.rc",

    ],

    test_config: "AndroidTest.xml",

    test_suites: ["general-tests"],

}