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: [
diff --git a/libs/vbmeta/Android.bp b/libs/vbmeta/Android.bp
index 9a7375d..15c7b4a 100644
--- a/libs/vbmeta/Android.bp
+++ b/libs/vbmeta/Android.bp
@@ -31,7 +31,7 @@
"libanyhow",
"libtempfile",
],
- data: [
+ device_common_data: [
":avb_testkey_rsa2048",
":avb_testkey_rsa4096",
":avb_testkey_rsa8192",
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"],
diff --git a/tests/authfs/hosttests/Android.bp b/tests/authfs/hosttests/Android.bp
index 83ef853..50dbc05 100644
--- a/tests/authfs/hosttests/Android.bp
+++ b/tests/authfs/hosttests/Android.bp
@@ -20,6 +20,8 @@
per_testcase_directory: true,
data: [
":authfs_test_files",
+ ],
+ device_common_data: [
":MicrodroidTestApp",
],
}
diff --git a/tests/benchmark_hostside/Android.bp b/tests/benchmark_hostside/Android.bp
index b613a8a..e91ac8f 100644
--- a/tests/benchmark_hostside/Android.bp
+++ b/tests/benchmark_hostside/Android.bp
@@ -18,7 +18,7 @@
test_suites: [
"general-tests",
],
- data: [
+ device_common_data: [
":MicrodroidTestApp",
],
}
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index d0838a6..0f2fe58 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -20,7 +20,7 @@
"microdroid_payload_metadata",
],
per_testcase_directory: true,
- data: [
+ device_common_data: [
":MicrodroidTestApp",
":MicrodroidTestAppUpdated",
":microdroid_general_sepolicy.conf",
diff --git a/tests/pvmfw/Android.bp b/tests/pvmfw/Android.bp
index 0483066..e124e55 100644
--- a/tests/pvmfw/Android.bp
+++ b/tests/pvmfw/Android.bp
@@ -45,13 +45,17 @@
],
per_testcase_directory: true,
data: [
+ "assets/bcc.dat",
+ ],
+ device_common_data: [
":MicrodroidTestApp",
- ":pvmfw_test",
":test_avf_debug_policy_with_ramdump",
":test_avf_debug_policy_without_ramdump",
":test_avf_debug_policy_with_adb",
":test_avf_debug_policy_without_adb",
- "assets/bcc.dat",
+ ],
+ device_first_data: [
+ ":pvmfw_test",
],
data_device_bins_first: ["dtc_static"],
}
diff --git a/tests/vendor_images/Android.bp b/tests/vendor_images/Android.bp
index 66f0219..0430eaa 100644
--- a/tests/vendor_images/Android.bp
+++ b/tests/vendor_images/Android.bp
@@ -2,19 +2,13 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-prebuilt_etc {
- name: "vendor_sign_key",
- src: ":avb_testkey_rsa4096",
- installable: false,
-}
-
android_filesystem {
name: "test_microdroid_vendor_image",
partition_name: "microdroid-vendor",
type: "ext4",
file_contexts: ":microdroid_vendor_file_contexts.gen",
use_avb: true,
- avb_private_key: ":vendor_sign_key",
+ avb_private_key: ":avb_testkey_rsa4096",
rollback_index: 5,
}
@@ -24,7 +18,7 @@
type: "ext4",
file_contexts: ":microdroid_vendor_file_contexts.gen",
use_avb: true,
- avb_private_key: ":vendor_sign_key",
+ avb_private_key: ":avb_testkey_rsa4096",
}
android_filesystem {