diff options
| author | Michael Runge <mrunge@google.com> | 2014-10-15 19:54:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-15 19:54:22 +0000 |
| commit | 9d641c41db732c4e9e7a5dac074197f1a9d40bcc (patch) | |
| tree | 8beb5de8ac4bf442809506f20618ba3f20899e3c /tools | |
| parent | c69af6faebbc2546aebee2c5d08eedb28f2b52ee (diff) | |
| parent | 947894f87edd9ae3429d33011447346240200fdb (diff) | |
| download | build-9d641c41db732c4e9e7a5dac074197f1a9d40bcc.zip build-9d641c41db732c4e9e7a5dac074197f1a9d40bcc.tar.gz build-9d641c41db732c4e9e7a5dac074197f1a9d40bcc.tar.bz2 | |
Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/releasetools/sign_target_files_apks | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/releasetools/sign_target_files_apks b/tools/releasetools/sign_target_files_apks index 98d2dc1..075c925 100755 --- a/tools/releasetools/sign_target_files_apks +++ b/tools/releasetools/sign_target_files_apks @@ -175,10 +175,10 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, out_info = copy.copy(info) 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]) 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]) elif (info.filename.startswith("BOOT/") 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")): # don't copy these files if we're regenerating them below pass - elif (OPTIONS.replace_verity_public_key and + elif (OPTIONS.replace_verity_private_key and info.filename == "META/misc_info.txt"): pass - elif (OPTIONS.replace_verity_private_key and + elif (OPTIONS.replace_verity_public_key and info.filename == "BOOT/RAMDISK/verity_key"): pass else: |