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

Revert "Revert "Switch to Microdroid kernel"" 

This reverts commit b2cd21f1e8.

Bug: 236379922
Test: watch TH
Change-Id: I222fd682965510e61f47e82f4feb0a7d29093ca3
This commit is contained in:
Jiyong Park 2022-06-18 18:53:08 +09:00
parent 9bdb9893d4
commit 2ad0544fc1
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",
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",