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

Commit 8572ca54 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix pvmfw.img signing error" into android15-tests-dev

parents 39de17cf 609e2fa5
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -800,7 +800,10 @@ def ProcessTargetFiles(input_tf_zip: zipfile.ZipFile, output_tf_zip, misc_info,

        # 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(