p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 bf3fb024cd)
This commit is contained in:
Tao Bao 2019-03-22 13:15:39 -07:00
parent c62b9a2347
commit 1e4cbfaf5c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/sign_target_files_apks.py
View File

@ -600,7 +600,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
else: else:
common.ZipWriteStr(output_tf_zip, out_info, data) 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(): for info in input_tf_zip.infolist():
filename = info.filename filename = info.filename
if (os.path.dirname(filename) != 'SYSTEM/etc/security/apex' or 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) name = os.path.basename(filename)
# Skip PRESIGNED APEXes. # Copy the keys for PRESIGNED APEXes.
if name not in updated_apex_payload_keys: if name not in updated_apex_payload_keys:
data = input_tf_zip.read(filename)
common.ZipWriteStr(output_tf_zip, info, data)
continue continue
key_path = updated_apex_payload_keys[name] key_path = updated_apex_payload_keys[name]