pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jiyong Park 2022-06-13 11:42:45 +09:00
parent a9aada2311
commit 50c419782e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
microdroid/Android.bp
View File

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