Microdroid: Add support for android16-6.12 GKI as guest kernel
Bug: 392725856
Test: Boot Microdroid
Change-Id: I0cbb3b31d7eac3f0c2f8b9cf729e7dfb8b97e202
Merged-In: I0cbb3b31d7eac3f0c2f8b9cf729e7dfb8b97e202
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"],
diff --git a/build/apex/sign_virt_apex.py b/build/apex/sign_virt_apex.py
index e042f8d..57961a4 100644
--- a/build/apex/sign_virt_apex.py
+++ b/build/apex/sign_virt_apex.py
@@ -498,7 +498,7 @@
RunCommand(args, cmd)
-gki_versions = ['android15-6.6']
+gki_versions = ['android15-6.6', 'android16-6.12']
# dict of (key, file) for re-sign/verification. keys are un-versioned for readability.
virt_apex_non_gki_files = {