Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #65 from Pehrsons/b2g-4.4.2_r1_bug1055002
Browse files Browse the repository at this point in the history
Bug 1055002 - Use dumpkey.py instead of dumpkey.jar when signing. r=gerard-majax
  • Loading branch information
rvandermeulen committed Aug 30, 2014
2 parents 386ad5d + 6fa5406 commit 4b4336c
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions tools/releasetools/sign_target_files_apks
Expand Up @@ -286,10 +286,9 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
# predigested (by DumpPublicKey.java) and put in res/keys.
# extra_recovery_keys are used only in recovery.

p = common.Run(["java", "-jar",
os.path.join(OPTIONS.search_path, "framework", "dumpkey.jar")]
+ mapped_keys + extra_recovery_keys,
stdout=subprocess.PIPE)
# On B2G we don't build java jars, use a python implementation of dumpkey instead.
p = common.Run([os.path.join(os.path.dirname(__file__), "..", "dumpkey.py")]
+ mapped_keys + extra_recovery_keys, stdout=subprocess.PIPE)
data, _ = p.communicate()
if p.returncode != 0:
raise common.ExternalError("failed to run dumpkeys")
Expand Down

0 comments on commit 4b4336c

Please sign in to comment.