commit 09a2bdabba890932551c046c6c1221456f8e2dca
author Jiyong Park <jiyong@google.com> Mon Jun 13 16:44:45 2022 +0900
committer Jiyong Park <jiyong@google.com> Tue Jun 14 01:48:45 2022 +0000
tree 48d9483b4b0f05fbec79d5c421bf2ff36ecc408d
parent 460cc830f2d3bf4646e44e01c0abc7c00d05f7c7

Revert "Revert "Upgrade to android13-5.15 kernel""

This reverts commit dcea34ba827f64230bac747187380927c3ab4540.

Bug: 233317671
Test: Watch TH
Change-Id: If6d09975b0285d8e724e205c652004fbb11e58ff

apex/Android.bp

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",
 ]

apex/sign_virt_apex.py

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',