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

Commit 8ecbf1ca authored by SzuWei Lin's avatar SzuWei Lin Committed by Gerrit Code Review
Browse files

Merge "Fix pvmfw.img signing error" into main

parents 88a7e3a5 a7d257cc
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -910,7 +910,10 @@ def ProcessTargetFiles(input_tf_zip: zipfile.ZipFile, output_tf_zip: zipfile.Zip

        # b/384813199: handles the pre-signed com.android.virt.apex in GSI.
        if payload_key == 'PRESIGNED':
          new_pubkey = GetMicrodroidVbmetaKey(virt_apex_path,
          with tempfile.NamedTemporaryFile() as virt_apex_temp_file:
            virt_apex_temp_file.write(input_tf_zip.read(virt_apex_path))
            virt_apex_temp_file.flush()
            new_pubkey = GetMicrodroidVbmetaKey(virt_apex_temp_file.name,
                                                misc_info['avb_avbtool'])
        else:
          new_pubkey_path = common.ExtractAvbPublicKey(