From 50c419782e506ccb95795cc7f9c15f17c489c586 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 13 Jun 2022 11:42:45 +0900
Subject: [PATCH] Switch to Microdroid kernel

Note that the kernel modules are dropped from vendor_boot because the
virtio drivers (which were modules) are now built in the kernel.

Bug: 231117670
Test: watch TH
Change-Id: Ied89adc1a68cf006aaca0374ff7e8000416b82a4
---
 microdroid/Android.bp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 4b804b16..7f240f6e 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -246,11 +246,11 @@ bootimg {
     kernel_prebuilt: "empty_kernel",
     arch: {
         arm64: {
-            kernel_prebuilt: ":kernel_prebuilts-5.15-arm64",
+            kernel_prebuilt: ":microdroid_kernel_prebuilts-5.15-arm64",
             cmdline: microdroid_boot_cmdline,
         },
         x86_64: {
-            kernel_prebuilt: ":kernel_prebuilts-5.15-x86_64",
+            kernel_prebuilt: ":microdroid_kernel_prebuilts-5.15-x86_64",
             cmdline: microdroid_boot_cmdline + [
                 // console=none is to work around the x86 specific u-boot behavior which when
                 // console= option is not found in the kernel commandline console=ttyS0 is
@@ -317,6 +317,8 @@ bootimg {
     avb_private_key: ":microdroid_sign_key",
 }
 
+// TODO(b/231117670) remove this when VirtualizationTestCases moves to the
+// microdroid kernel
 prebuilt_kernel_modules {
     name: "microdroid_kernel_modules",
     arch: {
@@ -334,7 +336,6 @@ android_filesystem {
     name: "microdroid_vendor_ramdisk",
     deps: [
         "microdroid_fstab",
-        "microdroid_kernel_modules",
     ],
     base_dir: "first_stage_ramdisk",
     type: "compressed_cpio",