Upgrade to android13-5.15 kernel
... in preparation for the migration to android14-5.15 kernel.
In addition, drop the version suffix from the module names to make
version upgrade less intrusive.
Bug: 233317671
Test: watch TH
Change-Id: Id1fe79c848c5ecb9c3ff5c0ba2c2527e7d907d0e
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 a1e81d2..7bdbf50 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -363,8 +363,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',