p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d 

am: f518748b2b

Change-Id: I349111540e765af64cdd0f915819e2a290c01ea1
This commit is contained in:
Baligh Uddin 2019-08-27 00:34:56 -07:00 committed by android-build-merger
parent cc0234ba55 f518748b2b
commit fd39c26b39
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)