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
This commit is contained in:
Cole Faust 2024-10-22 16:31:05 -07:00
parent 2307e47ed0
commit 09c18c17fd
2 changed files with 23 additions and 14 deletions

View file

@ -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"],
}

View file

@ -17,25 +17,34 @@ package {
}
cc_binary {
name: "mte_upgrade_test_helper",
srcs: ["mte_upgrade_test_helper.cpp"],
sanitize: {
memtag_heap: true,
diag: {
memtag_heap: false,
name: "mte_upgrade_test_helper",
srcs: ["mte_upgrade_test_helper.cpp"],
sanitize: {
memtag_heap: true,
diag: {
memtag_heap: false,
},
},
},
init_rc: [
"mte_upgrade_test.rc",
],
init_rc: [
"mte_upgrade_test.rc",
],
}
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"],
}