diff options
author | T.R. Fullhart <tfullhart@google.com> | 2013-03-18 10:31:26 -0700 |
---|---|---|
committer | T.R. Fullhart <tfullhart@google.com> | 2013-06-05 09:57:55 -0700 |
commit | a28acc6972ce35e9dfab061f175e229859d3e4db (patch) | |
tree | d5447c21aeb6049428e04432f56d7e721db4a9e9 /tools/releasetools/sign_target_files_apks | |
parent | f14d85d6fcb740930f15325611609406d658684c (diff) | |
download | build-a28acc6972ce35e9dfab061f175e229859d3e4db.zip build-a28acc6972ce35e9dfab061f175e229859d3e4db.tar.gz build-a28acc6972ce35e9dfab061f175e229859d3e4db.tar.bz2 |
Add support for using custom signapk.jar.
Details:
* New --signapk_path, --extra_signapk_args, --java_path.
* New --public_key_suffix, --private_key_suffix so you can change the filenames.
* Fixes raising exceptions on error.
Change-Id: I0b7014b6d779d52ae896f95dfecb1bcccf536cf4
Diffstat (limited to 'tools/releasetools/sign_target_files_apks')
-rwxr-xr-x | tools/releasetools/sign_target_files_apks | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/releasetools/sign_target_files_apks b/tools/releasetools/sign_target_files_apks index eaad8a4..9fb1008 100755 --- a/tools/releasetools/sign_target_files_apks +++ b/tools/releasetools/sign_target_files_apks @@ -208,7 +208,7 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info): try: keylist = input_tf_zip.read("META/otakeys.txt").split() except KeyError: - raise ExternalError("can't read META/otakeys.txt from input") + raise common.ExternalError("can't read META/otakeys.txt from input") extra_recovery_keys = misc_info.get("extra_recovery_keys", None) if extra_recovery_keys: @@ -223,7 +223,7 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info): for k in keylist: m = re.match(r"^(.*)\.x509\.pem$", k) if not m: - raise ExternalError("can't parse \"%s\" from META/otakeys.txt" % (k,)) + raise common.ExternalError("can't parse \"%s\" from META/otakeys.txt" % (k,)) k = m.group(1) mapped_keys.append(OPTIONS.key_map.get(k, k) + ".x509.pem") @@ -247,7 +247,7 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info): stdout=subprocess.PIPE) data, _ = p.communicate() if p.returncode != 0: - raise ExternalError("failed to run dumpkeys") + raise common.ExternalError("failed to run dumpkeys") common.ZipWriteStr(output_tf_zip, "RECOVERY/RAMDISK/res/keys", data) # SystemUpdateActivity uses the x509.pem version of the keys, but |