Revert "Remove vendor partition"
Revert submission 2625691
Reason for revert: b/287283650
Reverted changes: /q/submissionid:2625691
Change-Id: I974c2b96230507d4360f4333608c22e219af9667
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index a42f5ec..3f3600d 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -427,21 +427,23 @@
# unpacked files (will be unpacked from super.img below)
system_a_img = os.path.join(unpack_dir.name, 'system_a.img')
+ vendor_a_img = os.path.join(unpack_dir.name, 'vendor_a.img')
# re-sign super.img
# 1. unpack super.img
- # 2. resign system
- # 3. repack super.img out of resigned system
+ # 2. resign system and vendor
+ # 3. repack super.img out of resigned system and vendor
UnpackSuperImg(args, files['super.img'], unpack_dir.name)
system_a_f = Async(AddHashTreeFooter, args, key, system_a_img)
- partitions = {"system_a": system_a_img}
+ vendor_a_f = Async(AddHashTreeFooter, args, key, vendor_a_img)
+ partitions = {"system_a": system_a_img, "vendor_a": vendor_a_img}
Async(MakeSuperImage, args, partitions,
- files['super.img'], wait=[system_a_f])
+ files['super.img'], wait=[system_a_f, vendor_a_f])
- # re-generate vbmeta from re-signed system_a.img
+ # re-generate vbmeta from re-signed {system_a, vendor_a}.img
vbmeta_f = Async(MakeVbmetaImage, args, key, files['vbmeta.img'],
- images=[system_a_img],
- wait=[system_a_f])
+ images=[system_a_img, vendor_a_img],
+ wait=[system_a_f, vendor_a_f])
vbmeta_bc_f = None
if not args.do_not_update_bootconfigs:
@@ -473,6 +475,7 @@
# unpacked files
UnpackSuperImg(args, files['super.img'], unpack_dir.name)
system_a_img = os.path.join(unpack_dir.name, 'system_a.img')
+ vendor_a_img = os.path.join(unpack_dir.name, 'vendor_a.img')
# Read pubkey digest from the input key
with tempfile.NamedTemporaryFile() as pubkey_file:
@@ -492,6 +495,7 @@
continue
if f == files['super.img']:
Async(check_avb_pubkey, system_a_img)
+ Async(check_avb_pubkey, vendor_a_img)
else:
# Check pubkey for other files using avbtool
Async(check_avb_pubkey, f)