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

Commit c7dad764 authored by SzuWei Lin's avatar SzuWei Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix pvmfw.img signing error" into main am: 8ecbf1ca am: 570d8e75 

Original change: https://android-review.googlesource.com/c/platform/build/+/3495624



Change-Id: I5cf57fb2812a1cd1a97b9d7272212a8625d8c3a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bec4cf5e 570d8e75

tools/releasetools/sign_target_files_apks.py

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