Microdroid: Add support for android15-6.6 GKI as guest kernel
Bug: 325991735
Test: build & install virt APEX with android15-6.6 GKI
Test: AVF presubmit tests
Change-Id: I16b5b4e0927cbddd000d17724319bcecd5ab6640
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index c6d6090..d4158d4 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -646,6 +646,74 @@
src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable",
}
+///////////////////////////////////////
+// GKI-android15-6.6
+///////////////////////////////////////
+prebuilt_etc {
+ name: "microdroid_gki-android15-6.6.json",
+ src: "microdroid_gki-android15-6.6.json",
+}
+
+avb_add_hash_footer {
+ name: "microdroid_gki-android15-6.6_kernel_signed",
+ defaults: ["microdroid_kernel_signed_defaults"],
+ filename: "microdroid_gki-android15-6.6_kernel_signed",
+ arch: {
+ arm64: {
+ src: ":microdroid_gki_kernel_prebuilts-android15-6.6-arm64",
+ },
+ x86_64: {
+ src: ":microdroid_gki_kernel_prebuilts-android15-6.6-x86_64",
+ },
+ },
+ include_descriptors_from_images: [
+ ":microdroid_gki-android15-6.6_initrd_normal_hashdesc",
+ ":microdroid_gki-android15-6.6_initrd_debug_hashdesc",
+ ],
+}
+
+// HACK: use cc_genrule for arch-specific properties
+cc_genrule {
+ name: "microdroid_gki-android15-6.6_kernel_signed-lz4",
+ out: ["microdroid_gki-android15-6.6_kernel_signed-lz4"],
+ srcs: [":empty_file"],
+ arch: {
+ arm64: {
+ srcs: [":microdroid_gki-android15-6.6_kernel_signed"],
+ exclude_srcs: [":empty_file"],
+ },
+ },
+ tools: ["lz4"],
+ cmd: "$(location lz4) -9 $(in) $(out)",
+}
+
+prebuilt_etc {
+ name: "microdroid_gki-android15-6.6_kernel",
+ filename: "microdroid_gki-android15-6.6_kernel",
+ src: ":empty_file",
+ relative_install_path: "fs",
+ arch: {
+ arm64: {
+ src: ":microdroid_gki-android15-6.6_kernel_signed",
+ },
+ x86_64: {
+ src: ":microdroid_gki-android15-6.6_kernel_signed",
+ },
+ },
+}
+
+avb_gen_vbmeta_image {
+ name: "microdroid_gki-android15-6.6_initrd_normal_hashdesc",
+ defaults: ["microdroid_initrd_normal_defaults"],
+ src: ":microdroid_gki-android15-6.6_initrd_normal",
+}
+
+avb_gen_vbmeta_image {
+ name: "microdroid_gki-android15-6.6_initrd_debug_hashdesc",
+ defaults: ["microdroid_initrd_debug_defaults"],
+ src: ":microdroid_gki-android15-6.6_initrd_debuggable",
+}
+
python_binary_host {
name: "extract_microdroid_kernel_hashes",
srcs: ["extract_microdroid_kernel_hashes.py"],
@@ -657,10 +725,16 @@
srcs: [":microdroid_kernel"],
arch: {
arm64: {
- srcs: [":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed"],
+ srcs: [
+ ":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
+ ":microdroid_gki-android15-6.6_kernel_signed",
+ ],
},
x86_64: {
- srcs: [":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed"],
+ srcs: [
+ ":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
+ ":microdroid_gki-android15-6.6_kernel_signed",
+ ],
},
},
out: ["lib.rs"],