Revert "Upgrade to android13-5.15 kernel"
Revert "Add Android.bp for microdroid"
Revert "Add Android.bp for microdroid"
Revert submission 2103024-microdroid_kernel_5_15
Reason for revert: Broke tests - see http://b/233317671#comment20
Reverted Changes:
Id1fe79c84:Upgrade to android13-5.15 kernel
Ia521c665d:Add Android.bp for microdroid
I570ca3cc4:Add Android.bp for microdroid
Change-Id: I41990cb01f13667f4331bea9357cbdfb2058b346
diff --git a/apex/Android.bp b/apex/Android.bp
index 4698088..0f30c67 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -4,9 +4,9 @@
microdroid_filesystem_images = [
"microdroid_super",
- "microdroid_boot",
+ "microdroid_boot-5.10",
"microdroid_init_boot",
- "microdroid_vendor_boot",
+ "microdroid_vendor_boot-5.10",
"microdroid_vbmeta",
"microdroid_vbmeta_bootconfig",
]
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 7bdbf50..a1e81d2 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.img',
- 'vendor_boot.img': 'etc/fs/microdroid_vendor_boot.img',
+ 'boot.img': 'etc/fs/microdroid_boot-5.10.img',
+ 'vendor_boot.img': 'etc/fs/microdroid_vendor_boot-5.10.img',
'init_boot.img': 'etc/fs/microdroid_init_boot.img',
'super.img': 'etc/fs/microdroid_super.img',
'vbmeta.img': 'etc/fs/microdroid_vbmeta.img',