commit f49350ec41fb8f2651b80c5d420925bcc509cbd4
author Nikita Ioffe <ioffe@google.com> Fri Nov 01 16:11:48 2024 +0000
committer Nikita Ioffe <ioffe@google.com> Sun Nov 03 23:25:24 2024 +0000
tree 53f3719d1a81e2c573ee14f12bba988fae9f84e8
parent 505d5a4426ebca3bbe0308393fa9bd7d13efa3e3

Reland Add microdroid_16k

So far only non-protected VMs can boot with 16k kernel.

Support for microdroid_16k pvms is tracked in b/376870129.

Bug: 317201718
Bug: 376517173
Bug: 333730505
Bug: 376870129
Test: adb shell /apex/com.android.virt/bin/vm run-microdroid \
    --os microdroid_16k \
    --debug full
Test: atest MicrodropidTests
Test: atest MicrodroidHostTestCases
Test: atest virtualizationmanager_device_test
Test: presubmit
Change-Id: I0fe5cd431b16f57e5bcc51146691fd0368d30818

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index e940e71..4759c19 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -154,6 +154,14 @@
     }) + select(release_flag("RELEASE_AVF_ENABLE_NETWORK"), {
         true: ["com.android.virt.vmnic.rc"],
         default: [],
+    }) + select(soong_config_variable("ANDROID", "target_boots_16k"), {
+        true: [
+            "microdroid_16k_initrd_debuggable",
+            "microdroid_16k_initrd_normal",
+            "microdroid_kernel_16k",
+            "microdroid_16k.json",
+        ],
+        default: [],
     }),
     host_required: [
         "vm_shell",