Revert "Revert "Upgrade to android13-5.15 kernel""
This reverts commit dcea34ba827f64230bac747187380927c3ab4540.
Bug: 233317671
Test: Watch TH
Change-Id: If6d09975b0285d8e724e205c652004fbb11e58ff
diff --git a/apex/Android.bp b/apex/Android.bp
index 0f30c67..4698088 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -4,9 +4,9 @@
microdroid_filesystem_images = [
"microdroid_super",
- "microdroid_boot-5.10",
+ "microdroid_boot",
"microdroid_init_boot",
- "microdroid_vendor_boot-5.10",
+ "microdroid_vendor_boot",
"microdroid_vbmeta",
"microdroid_vbmeta_bootconfig",
]
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 1c0714e..e314b71 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -361,8 +361,8 @@
virt_apex_files = {
'bootloader.pubkey': 'etc/microdroid_bootloader.avbpubkey',
'bootloader': 'etc/microdroid_bootloader',
- 'boot.img': 'etc/fs/microdroid_boot-5.10.img',
- 'vendor_boot.img': 'etc/fs/microdroid_vendor_boot-5.10.img',
+ 'boot.img': 'etc/fs/microdroid_boot.img',
+ 'vendor_boot.img': 'etc/fs/microdroid_vendor_boot.img',
'init_boot.img': 'etc/fs/microdroid_init_boot.img',
'super.img': 'etc/fs/microdroid_super.img',
'vbmeta.img': 'etc/fs/microdroid_vbmeta.img',
diff --git a/docs/getting_started/index.md b/docs/getting_started/index.md
index be22fe3..9c9bf92 100644
--- a/docs/getting_started/index.md
+++ b/docs/getting_started/index.md
@@ -119,7 +119,7 @@
```shell
mkdir android-kernel && cd android-kernel
-repo init -u https://android.googlesource.com/kernel/manifest -b common-android12-5.10
+repo init -u https://android.googlesource.com/kernel/manifest -b common-android13-5.15
repo sync
FAST_BUILD=1 DIST_DIR=out/dist BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh -j80
```
@@ -130,7 +130,7 @@
Then copy the built kernel to the Android source tree.
```
-cp out/dist/Image <android_root>/kernel/prebuilts/5.10/arm64/kernel-5.10
+cp out/dist/Image <android_root>/kernel/prebuilts/5.15/arm64/kernel-5.15
```
Finally rebuild the `com.android.virt` APEX and install it by following the
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 8702568..4b804b1 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -240,17 +240,17 @@
]
bootimg {
- name: "microdroid_boot-5.10",
+ name: "microdroid_boot",
// We don't have kernel for arm and x86. But Soong demands one when it builds for
// arm or x86 target. Satisfy that by providing an empty file as the kernel.
kernel_prebuilt: "empty_kernel",
arch: {
arm64: {
- kernel_prebuilt: ":kernel_prebuilts-5.10-arm64",
+ kernel_prebuilt: ":kernel_prebuilts-5.15-arm64",
cmdline: microdroid_boot_cmdline,
},
x86_64: {
- kernel_prebuilt: ":kernel_prebuilts-5.10-x86_64",
+ kernel_prebuilt: ":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
@@ -272,7 +272,7 @@
bootimg {
name: "microdroid_init_boot",
- ramdisk_module: "microdroid_ramdisk-5.10",
+ ramdisk_module: "microdroid_ramdisk",
kernel_prebuilt: "empty_kernel",
header_version: "4",
partition_name: "init_boot",
@@ -281,7 +281,7 @@
}
android_filesystem {
- name: "microdroid_ramdisk-5.10",
+ name: "microdroid_ramdisk",
deps: [
"init_first_stage",
],
@@ -299,8 +299,8 @@
}
bootimg {
- name: "microdroid_vendor_boot-5.10",
- ramdisk_module: "microdroid_vendor_ramdisk-5.10",
+ name: "microdroid_vendor_boot",
+ ramdisk_module: "microdroid_vendor_ramdisk",
dtb_prebuilt: "dummy_dtb.img",
header_version: "4",
vendor_boot: true,
@@ -321,17 +321,17 @@
name: "microdroid_kernel_modules",
arch: {
arm64: {
- srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.10-arm64"],
+ srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.15-arm64"],
},
x86_64: {
- srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.10-x86_64"],
+ srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.15-x86_64"],
},
},
- kernel_version: "5.10",
+ kernel_version: "5.15",
}
android_filesystem {
- name: "microdroid_vendor_ramdisk-5.10",
+ name: "microdroid_vendor_ramdisk",
deps: [
"microdroid_fstab",
"microdroid_kernel_modules",
@@ -600,9 +600,9 @@
private_key: ":microdroid_sign_key",
partitions: [
"microdroid_vendor",
- "microdroid_vendor_boot-5.10",
+ "microdroid_vendor_boot",
"microdroid",
- "microdroid_boot-5.10",
+ "microdroid_boot",
"microdroid_init_boot",
],
}
diff --git a/microdroid/microdroid.json b/microdroid/microdroid.json
index aff0b7b..bf8d93e 100644
--- a/microdroid/microdroid.json
+++ b/microdroid/microdroid.json
@@ -5,7 +5,7 @@
"partitions": [
{
"label": "boot_a",
- "path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
+ "path": "/apex/com.android.virt/etc/fs/microdroid_boot.img"
},
{
"label": "init_boot_a",
@@ -13,7 +13,7 @@
},
{
"label": "vendor_boot_a",
- "path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot-5.10.img"
+ "path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot.img"
},
{
"label": "vbmeta_a",
diff --git a/tests/Android.bp b/tests/Android.bp
index 2c36a62..a06a33a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -16,7 +16,7 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-kernel_version = "5.10"
+kernel_version = "5.15"
kernel_stem = "kernel_prebuilts-" + kernel_version