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/build/apex/Android.bp b/build/apex/Android.bp
index 4b69660..89b6fc5 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -289,9 +289,11 @@
"libz",
],
data: [
- ":com.android.virt",
":test.com.android.virt.pem",
],
+ device_common_data: [
+ ":com.android.virt",
+ ],
test_suites: ["general-tests"],
}
diff --git a/build/microdroid/Android.bp b/build/microdroid/Android.bp
index 27d0246..cacf356 100644
--- a/build/microdroid/Android.bp
+++ b/build/microdroid/Android.bp
@@ -197,7 +197,7 @@
no_full_install: true,
}
-genrule {
+java_genrule {
name: "microdroid_build_prop_gen_x86_64",
srcs: [
"build.prop",
@@ -215,7 +215,7 @@
"echo ro.product.cpu.abi=x86_64) > $(out)",
}
-genrule {
+java_genrule {
name: "microdroid_build_prop_gen_arm64",
srcs: [
"build.prop",
diff --git a/build/microdroid/initrd/Android.bp b/build/microdroid/initrd/Android.bp
index 9904511..6d45417 100644
--- a/build/microdroid/initrd/Android.bp
+++ b/build/microdroid/initrd/Android.bp
@@ -30,7 +30,7 @@
srcs: ["gen_vbmeta_bootconfig.py"],
}
-genrule {
+java_genrule {
name: "microdroid_initrd_gen",
srcs: [
":microdroid_ramdisk",
@@ -40,7 +40,7 @@
cmd: "cat $(in) > $(out)",
}
-genrule {
+java_genrule {
name: "microdroid_gki-android15-6.6_initrd_gen_arm64",
srcs: [
":microdroid_ramdisk",
@@ -51,7 +51,7 @@
cmd: "cat $(in) > $(out)",
}
-genrule {
+java_genrule {
name: "microdroid_gki-android15-6.6_initrd_gen_x86_64",
srcs: [
":microdroid_ramdisk",
@@ -63,7 +63,7 @@
}
// This contains vbmeta hashes & related (boot)configs which are passed to kernel/init
-genrule {
+java_genrule {
name: "microdroid_vbmeta_bootconfig_gen",
srcs: [":microdroid_vbmeta"],
out: ["bootconfig_microdroid_vbmeta"],
@@ -84,7 +84,7 @@
":microdroid_vbmeta_bootconfig_gen",
]
-genrule {
+java_genrule {
name: "microdroid_initrd_debuggable_arm64",
tools: ["initrd_bootconfig"],
srcs: [
@@ -95,7 +95,7 @@
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
-genrule {
+java_genrule {
name: "microdroid_gki-android15-6.6_initrd_debuggable_arm64",
tools: ["initrd_bootconfig"],
srcs: [
@@ -106,7 +106,7 @@
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
-genrule {
+java_genrule {
name: "microdroid_initrd_debuggable_x86_64",
tools: ["initrd_bootconfig"],
srcs: [
@@ -117,7 +117,7 @@
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
-genrule {
+java_genrule {
name: "microdroid_gki-android15-6.6_initrd_debuggable_x86_64",
tools: ["initrd_bootconfig"],
srcs: [
@@ -128,7 +128,7 @@
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
-genrule {
+java_genrule {
name: "microdroid_initrd_normal_arm64",
tools: ["initrd_bootconfig"],
srcs: [
@@ -139,7 +139,7 @@
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
-genrule {
+java_genrule {
name: "microdroid_gki-android15-6.6_initrd_normal_arm64",
tools: ["initrd_bootconfig"],
srcs: [
@@ -150,7 +150,7 @@
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
-genrule {
+java_genrule {
name: "microdroid_initrd_normal_x86_64",
tools: ["initrd_bootconfig"],
srcs: [
@@ -161,7 +161,7 @@
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
-genrule {
+java_genrule {
name: "microdroid_gki-android15-6.6_initrd_normal_x86_64",
tools: ["initrd_bootconfig"],
srcs: [