StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev

Browse Source
This commit is contained in:
Michael Runge
2014-10-15 19:54:21 +00:00
committed by Android (Google) Code Review
parent c69af6faeb 947894f87e
commit 9d641c41db
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/sign_target_files_apks
View File

@@ -175,10 +175,10 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
out_info = copy.copy(info) out_info = copy.copy(info)
if (info.filename == "META/misc_info.txt" and if (info.filename == "META/misc_info.txt" and
OPTIONS.replace_verity_public_key): OPTIONS.replace_verity_private_key):
ReplaceVerityPrivateKey(input_tf_zip, output_tf_zip, misc_info, OPTIONS.replace_verity_private_key[1]) ReplaceVerityPrivateKey(input_tf_zip, output_tf_zip, misc_info, OPTIONS.replace_verity_private_key[1])
elif (info.filename == "BOOT/RAMDISK/verity_key" and elif (info.filename == "BOOT/RAMDISK/verity_key" and
OPTIONS.replace_verity_private_key): OPTIONS.replace_verity_public_key):
ReplaceVerityPublicKey(output_tf_zip, OPTIONS.replace_verity_public_key[1]) ReplaceVerityPublicKey(output_tf_zip, OPTIONS.replace_verity_public_key[1])
elif (info.filename.startswith("BOOT/") or elif (info.filename.startswith("BOOT/") or
info.filename.startswith("RECOVERY/") or info.filename.startswith("RECOVERY/") or
@@ -216,10 +216,10 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
"SYSTEM/etc/security/otacerts.zip")): "SYSTEM/etc/security/otacerts.zip")):
# don't copy these files if we're regenerating them below # don't copy these files if we're regenerating them below
pass pass
elif (OPTIONS.replace_verity_public_key and elif (OPTIONS.replace_verity_private_key and
info.filename == "META/misc_info.txt"): info.filename == "META/misc_info.txt"):
pass pass
elif (OPTIONS.replace_verity_private_key and elif (OPTIONS.replace_verity_public_key and
info.filename == "BOOT/RAMDISK/verity_key"): info.filename == "BOOT/RAMDISK/verity_key"):
pass pass
else: else: