Use select() in build/Android.bp and guest/kernel/
Bug: 354824866
Test: build
Change-Id: I0e03b93403f2fb1221f1e4ec30ab98bf31bfe7c8
diff --git a/build/Android.bp b/build/Android.bp
index 3b6b8b5..66cc626 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -18,86 +18,50 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-soong_config_module_type {
- name: "avf_flag_aware_rust_defaults",
- module_type: "rust_defaults",
- config_namespace: "ANDROID",
- bool_variables: [
- "release_avf_enable_device_assignment",
- "release_avf_enable_dice_changes",
- "release_avf_enable_llpvm_changes",
- "release_avf_enable_multi_tenant_microdroid_vm",
- "release_avf_enable_network",
- "release_avf_enable_remote_attestation",
- "release_avf_enable_vendor_modules",
- "release_avf_enable_virt_cpufreq",
- "release_avf_support_custom_vm_with_paravirtualized_devices",
- ],
- properties: [
- "cfgs",
- ],
-}
-
-avf_flag_aware_rust_defaults {
+rust_defaults {
name: "avf_build_flags_rust",
- soong_config_variables: {
- release_avf_enable_device_assignment: {
- cfgs: ["device_assignment"],
- },
- release_avf_enable_dice_changes: {
- cfgs: ["dice_changes"],
- },
- release_avf_enable_llpvm_changes: {
- cfgs: ["llpvm_changes"],
- },
- release_avf_enable_multi_tenant_microdroid_vm: {
- cfgs: ["multi_tenant"],
- },
- release_avf_enable_network: {
- cfgs: ["network"],
- },
- release_avf_enable_remote_attestation: {
- cfgs: ["remote_attestation"],
- },
- release_avf_enable_vendor_modules: {
- cfgs: ["vendor_modules"],
- },
- release_avf_enable_virt_cpufreq: {
- cfgs: ["virt_cpufreq"],
- },
- release_avf_support_custom_vm_with_paravirtualized_devices: {
- cfgs: ["paravirtualized_devices"],
- },
- },
+ cfgs: select(release_flag("RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT"), {
+ true: ["device_assignment"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_DICE_CHANGES"), {
+ true: ["dice_changes"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_LLPVM_CHANGES"), {
+ true: ["llpvm_changes"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM"), {
+ true: ["multi_tenant"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_NETWORK"), {
+ true: ["network"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_REMOTE_ATTESTATION"), {
+ true: ["remote_attestation"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_VENDOR_MODULES"), {
+ true: ["vendor_modules"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_VIRT_CPUFREQ"), {
+ true: ["virt_cpufreq"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"), {
+ true: ["paravirtualized_devices"],
+ default: [],
+ }),
}
-soong_config_module_type {
- name: "avf_flag_aware_cc_defaults",
- module_type: "cc_defaults",
- config_namespace: "ANDROID",
- bool_variables: [
- "release_avf_enable_dice_changes",
- "release_avf_enable_vendor_modules",
- "release_avf_enable_virt_cpufreq",
- ],
- properties: [
- "cflags",
- ],
-}
-
-avf_flag_aware_cc_defaults {
+cc_defaults {
name: "avf_build_flags_cc",
- soong_config_variables: {
- release_avf_enable_dice_changes: {
- cflags: ["-DAVF_OPEN_DICE_CHANGES=1"],
- },
- release_avf_enable_vendor_modules: {
- cflags: ["-DAVF_ENABLE_VENDOR_MODULES=1"],
- },
- release_avf_enable_virt_cpufreq: {
- cflags: ["-DAVF_ENABLE_VIRT_CPUFREQ=1"],
- },
- },
+ cflags: select(release_flag("RELEASE_AVF_ENABLE_DICE_CHANGES"), {
+ true: ["-DAVF_OPEN_DICE_CHANGES=1"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_VENDOR_MODULES"), {
+ true: ["-DAVF_ENABLE_VENDOR_MODULES=1"],
+ default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_VIRT_CPUFREQ"), {
+ true: ["-DAVF_ENABLE_VIRT_CPUFREQ=1"],
+ default: [],
+ }),
}
genrule_defaults {
diff --git a/guest/kernel/Android.bp b/guest/kernel/Android.bp
index 7a8af90..19cdc49 100644
--- a/guest/kernel/Android.bp
+++ b/guest/kernel/Android.bp
@@ -26,66 +26,30 @@
// large-scale-change unable to identify any license_text files
}
-soong_config_module_type {
- name: "avf_microdroid_kernel_prebuilt",
- module_type: "filegroup",
- config_namespace: "ANDROID",
- variables: [
- "release_avf_microdroid_kernel_version",
- ],
- properties: [
- "srcs",
- ],
-}
-
-soong_config_string_variable {
- name: "release_avf_microdroid_kernel_version",
- values: [
- "android14_61",
- "android15_66",
- ],
-}
-
-avf_microdroid_kernel_prebuilt {
+filegroup {
name: "microdroid_kernel_prebuilt-arm64",
// Below are properties that are conditionally set depending on value of build flags.
- soong_config_variables: {
- release_avf_microdroid_kernel_version: {
- android14_61: {
- srcs: ["android14-6.1/arm64/kernel-6.1"],
- },
- android15_66: {
- srcs: ["android15-6.6/arm64/kernel-6.6"],
- },
- // In case release configuration doesn't specify value of the
- // RELEASE_AVF_MICRODROID_KERNEL_VERSION fallback to the kernel we
- // already released.
- // TODO(b/298011555): remove this once we set the flag in all release configs.
- conditions_default: {
- srcs: ["android14-6.1/arm64/kernel-6.1"],
- },
- },
- },
+ srcs: select(release_flag("RELEASE_AVF_MICRODROID_KERNEL_VERSION"), {
+ "android14_61": ["android14-6.1/arm64/kernel-6.1"],
+ "android15_66": ["android15-6.6/arm64/kernel-6.6"],
+ // In case release configuration doesn't specify value of the
+ // RELEASE_AVF_MICRODROID_KERNEL_VERSION fallback to the kernel we
+ // already released.
+ // TODO(b/298011555): remove this once we set the flag in all release configs.
+ default: ["android14-6.1/arm64/kernel-6.1"],
+ }),
}
-avf_microdroid_kernel_prebuilt {
+filegroup {
name: "microdroid_kernel_prebuilt-x86_64",
// Below are properties that are conditionally set depending on value of build flags.
- soong_config_variables: {
- release_avf_microdroid_kernel_version: {
- android14_61: {
- srcs: ["android14-6.1/x86_64/kernel-6.1"],
- },
- android15_66: {
- srcs: ["android15-6.6/x86_64/kernel-6.6"],
- },
- // In case release configuration doesn't specify value of the
- // RELEASE_AVF_MICRODROID_KERNEL_VERSION fallback to the kernel we
- // already released.
- // TODO(b/298011555): remove this once we set the flag in all release configs.
- conditions_default: {
- srcs: ["android14-6.1/x86_64/kernel-6.1"],
- },
- },
- },
+ srcs: select(release_flag("RELEASE_AVF_MICRODROID_KERNEL_VERSION"), {
+ "android14_61": ["android14-6.1/x86_64/kernel-6.1"],
+ "android15_66": ["android15-6.6/x86_64/kernel-6.6"],
+ // In case release configuration doesn't specify value of the
+ // RELEASE_AVF_MICRODROID_KERNEL_VERSION fallback to the kernel we
+ // already released.
+ // TODO(b/298011555): remove this once we set the flag in all release configs.
+ default: ["android14-6.1/x86_64/kernel-6.1"],
+ }),
}