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: I0bd19892e7ad88d9259a3c2031e92b90ac530e1c
diff --git a/tests/authfs/benchmarks/Android.bp b/tests/authfs/benchmarks/Android.bp
index 27a6af1..aad8d59 100644
--- a/tests/authfs/benchmarks/Android.bp
+++ b/tests/authfs/benchmarks/Android.bp
@@ -19,7 +19,7 @@
"open_then_run",
],
per_testcase_directory: true,
- data: [
+ device_common_data: [
":authfs_test_files",
":MicrodroidTestApp",
],
@@ -43,7 +43,7 @@
java_genrule {
name: "measure_io_as_jar",
out: ["measure_io.jar"],
- srcs: [
+ device_first_srcs: [
":measure_io",
],
tools: ["soong_zip"],