commit 25b82060ba067b6467d98cb294eb9b4878dd77fb
author Andrei Homescu <ahomescu@google.com> Thu Jan 30 06:26:40 2025 +0000
committer Andrei Homescu <ahomescu@google.com> Sat Feb 01 09:41:07 2025 +0000
tree a1cade40b21b4836d3d5a2509b50bed3be20a489
parent 8eb34a725f84e0b56987fb4ee5a4b528ee4867ce

Microdroid: Add support for android16-6.12 GKI as guest kernel

Bug: 392725856
Test: Boot Microdroid
Change-Id: I0cbb3b31d7eac3f0c2f8b9cf729e7dfb8b97e202
Merged-In: I0cbb3b31d7eac3f0c2f8b9cf729e7dfb8b97e202

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 946bc8c..20f44fe 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -149,6 +149,12 @@
             "microdroid_gki-android15-6.6_kernel",
             "microdroid_gki-android15-6.6.json",
         ],
+        "android16_612": [
+            "microdroid_gki-android16-6.12_initrd_debuggable",
+            "microdroid_gki-android16-6.12_initrd_normal",
+            "microdroid_gki-android16-6.12_kernel",
+            "microdroid_gki-android16-6.12.json",
+        ],
         default: [],
     }) + select(release_flag("RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT"), {
         true: ["com.android.virt.vfio_handler.rc"],