pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert^2 "Change the vbmeta image for kernelboot mode" 

This contains the vbmeta verification for system & vendor
partitions.

This reverts commit 1c5ae03213

Test: atest MicrodroidTests
Bug: 240235424
Change-Id: Icbad5dd82a54b14ad4e7fe559a566455e050e049
This commit is contained in:
Shikha Panwar 2022-09-28 12:52:16 +00:00
parent ed8ace4411
commit 9b870dad60
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apex/sign_virt_apex.py
View File

@ -378,9 +378,9 @@ def SignVirtApex(args):
# re-sign bootloader, boot.img, vendor_boot.img, and init_boot.img
Async(AddHashFooter, args, key, files['bootloader'], wait=[replace_f])
boot_img_f = Async(AddHashFooter, args, key, files['boot.img'])
vendor_boot_img_f = Async(AddHashFooter, args, key, files['vendor_boot.img'])
init_boot_img_f = Async(AddHashFooter, args, key, files['init_boot.img'])
Async(AddHashFooter, args, key, files['boot.img'])
Async(AddHashFooter, args, key, files['vendor_boot.img'])
Async(AddHashFooter, args, key, files['init_boot.img'])
# re-sign super.img
# 1. unpack super.img
@ -392,11 +392,10 @@ def SignVirtApex(args):
partitions = {"system_a": system_a_img, "vendor_a": vendor_a_img}
Async(MakeSuperImage, args, partitions, files['super.img'], wait=[system_a_f, vendor_a_f])
# re-generate vbmeta from re-signed {boot, vendor_boot, init_boot, system_a, vendor_a}.img
# re-generate vbmeta from re-signed {system_a, vendor_a}.img
Async(MakeVbmetaImage, args, key, files['vbmeta.img'],
images=[files['boot.img'], files['vendor_boot.img'],
files['init_boot.img'], system_a_img, vendor_a_img],
wait=[boot_img_f, vendor_boot_img_f, init_boot_img_f, system_a_f, vendor_a_f])
images=[system_a_img, vendor_a_img],
wait=[system_a_f, vendor_a_f])
# Re-sign bootconfigs and the uboot_env with the same key
bootconfig_sign_key = key

3
microdroid/Android.bp
View File

@ -508,10 +508,7 @@ vbmeta {
private_key: ":microdroid_sign_key",
partitions: [
"microdroid_vendor",
"microdroid_vendor_boot",
"microdroid",
"microdroid_boot",
"microdroid_init_boot",
],
}