Revert "Migrate to avb_add_hash_footer"
This reverts commit 26eca1fd2f8d13cd44fbff2ff031eaa4352fd534.
Reason for revert: Broke x86 build
Change-Id: Ia73721f073268aa059f577ab83afd3034c8c3ee5
diff --git a/apex/Android.bp b/apex/Android.bp
index fb8de4c..0f30c67 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -3,16 +3,12 @@
}
microdroid_filesystem_images = [
- "microdroid_boot-5.10",
- "microdroid_bootconfig_app_debuggable",
- "microdroid_bootconfig_full_debuggable",
- "microdroid_bootconfig_normal",
- "microdroid_init_boot",
"microdroid_super",
- "microdroid_uboot_env",
+ "microdroid_boot-5.10",
+ "microdroid_init_boot",
+ "microdroid_vendor_boot-5.10",
"microdroid_vbmeta",
"microdroid_vbmeta_bootconfig",
- "microdroid_vendor_boot-5.10",
]
apex {
@@ -64,8 +60,12 @@
prebuilts: [
"com.android.virt.init.rc",
"microdroid.json",
+ "microdroid_uboot_env",
"microdroid_bootloader",
"microdroid_bootloader.avbpubkey",
+ "microdroid_bootconfig_normal",
+ "microdroid_bootconfig_app_debuggable",
+ "microdroid_bootconfig_full_debuggable",
],
file_contexts: ":com.android.virt-file_contexts",
canned_fs_config: "canned_fs_config",
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 8f717d4..1c0714e 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -360,17 +360,17 @@
# dict of (key, file) for re-sign/verification. keys are un-versioned for readability.
virt_apex_files = {
'bootloader.pubkey': 'etc/microdroid_bootloader.avbpubkey',
- 'bootloader': 'etc/fs/microdroid_bootloader',
+ 'bootloader': 'etc/microdroid_bootloader',
'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',
'vbmeta_bootconfig.img': 'etc/fs/microdroid_vbmeta_bootconfig.img',
- 'bootconfig.normal': 'etc/fs/microdroid_bootconfig.normal',
- 'bootconfig.app_debuggable': 'etc/fs/microdroid_bootconfig.app_debuggable',
- 'bootconfig.full_debuggable': 'etc/fs/microdroid_bootconfig.full_debuggable',
- 'uboot_env.img': 'etc/fs/uboot_env.img'
+ 'bootconfig.normal': 'etc/microdroid_bootconfig.normal',
+ 'bootconfig.app_debuggable': 'etc/microdroid_bootconfig.app_debuggable',
+ 'bootconfig.full_debuggable': 'etc/microdroid_bootconfig.full_debuggable',
+ 'uboot_env.img': 'etc/uboot_env.img'
}