Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37f7212a authored by Baligh Uddin's avatar Baligh Uddin Committed by android-build-merger
Browse files

Merge "Add a guard against deleting AVB_PUBKey." am: 667c1aa8 am: 6fac8bab 

am: 8356e899

Change-Id: Ic7d3612fb6a7f7dbf690c2edd3cf20945a2f4684
parents e8b8eb7b 8356e899

tools/releasetools/apex_utils.py

+3 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ def SignApex(avbtool, 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(avbtool, payload_file)

  SignApexPayload(
@@ -192,6 +193,7 @@ def SignApex(avbtool, apex_data, payload_key, container_key, container_pw, 
  payload_public_key = common.ExtractAvbPublicKey(avbtool, payload_key)



  common.ZipDelete(apex_file, APEX_PAYLOAD_IMAGE)

  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)