Revert "Revert "Switch to Microdroid kernel""
This reverts commit b2cd21f1e84b457c7662ffd299f421b20f512544.
Bug: 236379922
Test: watch TH
Change-Id: I222fd682965510e61f47e82f4feb0a7d29093ca3
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 4b804b1..7f240f6 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -246,11 +246,11 @@
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 @@
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 @@
name: "microdroid_vendor_ramdisk",
deps: [
"microdroid_fstab",
- "microdroid_kernel_modules",
],
base_dir: "first_stage_ramdisk",
type: "compressed_cpio",