Use select() in build/Android.bp and guest/kernel/
Bug: 354824866
Test: build
Change-Id: I0e03b93403f2fb1221f1e4ec30ab98bf31bfe7c8
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"],
+ }),
}