tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DO NOT MERGE - Add a guard against deleting AVB_PUBKey.

Browse source 
am: 39b8f9fc7d

Change-Id: Ic1f496af3c6f58a2d0aaf41244c59a22eb927d93
This commit is contained in:
Baligh Uddin 2019-08-26 16:59:25 -07:00 committed by android-build-merger
commit f518748b2b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/releasetools/apex_utils.py
View file

@ -177,6 +177,7 @@ def SignApex(apex_data, payload_key, container_key, container_pw,
payload_dir = common.MakeTempDir(prefix='apex-payload-')
with zipfile.ZipFile(apex_file) as apex_fd:
payload_file = apex_fd.extract(APEX_PAYLOAD_IMAGE, payload_dir)
zip_items = apex_fd.namelist()
payload_info = ParseApexPayloadInfo(payload_file)
SignApexPayload(
@ -191,7 +192,8 @@ def SignApex(apex_data, payload_key, container_key, container_pw,
payload_public_key = common.ExtractAvbPublicKey(payload_key)
common.ZipDelete(apex_file, APEX_PAYLOAD_IMAGE)
common.ZipDelete(apex_file, APEX_PUBKEY)
if APEX_PUBKEY in zip_items:
common.ZipDelete(apex_file, APEX_PUBKEY)
apex_zip = zipfile.ZipFile(apex_file, 'a')
common.ZipWrite(apex_zip, payload_file, arcname=APEX_PAYLOAD_IMAGE)
common.ZipWrite(apex_zip, payload_public_key, arcname=APEX_PUBKEY)