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

Commit 1e4cbfaf authored by Tao Bao's avatar Tao Bao
Browse files

releasetools: Fix an issue in handling PRESIGNED APEX keys. 

For PRESIGNED APEXes, we should keep carrying the matching public keys
at /system/etc/security/apex.

Bug: 129148142
Test: Run sign_target_files_apks.py on a target_files.zip with presigned
      APEXes. Check the output zip.
Change-Id: I2e941fd9b10e99d2db9df1e5308cbbe8c760177b
(cherry picked from commit bf3fb024)
parent c62b9a23

tools/releasetools/sign_target_files_apks.py

+4 −2
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, 
    else:

      common.ZipWriteStr(output_tf_zip, out_info, data)



  # Update APEX payload public keys.

  # Copy or update APEX payload public keys.

  for info in input_tf_zip.infolist():

    filename = info.filename

    if (os.path.dirname(filename) != 'SYSTEM/etc/security/apex' or
@@ -609,8 +609,10 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, 


    name = os.path.basename(filename)



    # Skip PRESIGNED APEXes.

    # Copy the keys for PRESIGNED APEXes.

    if name not in updated_apex_payload_keys:

      data = input_tf_zip.read(filename)

      common.ZipWriteStr(output_tf_zip, info, data)

      continue



    key_path = updated_apex_payload_keys[name]