summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Runge <mrunge@google.com>2014-10-14 20:58:38 -0700
committerMichael Runge <mrunge@google.com>2014-10-14 20:58:38 -0700
commit947894f87edd9ae3429d33011447346240200fdb (patch)
tree9d5fe370e4e25853f12c0d7c41119f15522a80a7 /tools
parent4543ae819da023b8d51f36497c6e5445a51b70ba (diff)
downloadbuild-947894f87edd9ae3429d33011447346240200fdb.zip
build-947894f87edd9ae3429d33011447346240200fdb.tar.gz
build-947894f87edd9ae3429d33011447346240200fdb.tar.bz2
Fix public/private key options on sign_target_files_apks
The if statements appear to check for public_signing and then calls the private_signing function, and vice versa. Change-Id: I4511b9bcf0e03b9ba49b69eb80db84cf31d77020
Diffstat (limited to 'tools')
-rwxr-xr-xtools/releasetools/sign_target_files_apks8
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: