tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 1f8b697a: am e05628cc: fix signing user builds

Browse source 
Merge commit '1f8b697a7fc3102e495972fec0d8bca7e5698098'

* commit '1f8b697a7fc3102e495972fec0d8bca7e5698098':
  fix signing user builds
This commit is contained in:
Doug Zongker 2009-08-20 18:23:05 -07:00 committed by Android Git Automerger
commit 98cb09e37a
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/releasetools/common.py
View file

@ -145,7 +145,7 @@ def UnzipTemp(filename):
tmp = tempfile.mkdtemp(prefix="targetfiles-")
OPTIONS.tempfiles.append(tmp)
p = Run(["unzip", "-q", filename, "-d", tmp], stdout=subprocess.PIPE)
p = Run(["unzip", "-o", "-q", filename, "-d", tmp], stdout=subprocess.PIPE)
p.communicate()
if p.returncode != 0:
raise ExternalError("failed to unzip input target-files \"%s\"" %

9
tools/releasetools/sign_target_files_apks
View file

@ -268,8 +268,13 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip):
k = m.group(1)
mapped_keys.append(OPTIONS.key_map.get(k, k) + ".x509.pem")
print "using:\n ", "\n ".join(mapped_keys)
print "for OTA package verification"
if mapped_keys:
print "using:\n ", "\n ".join(mapped_keys)
print "for OTA package verification"
else:
mapped_keys.append(
OPTIONS.key_map["build/target/product/security/testkey"] + ".x509.pem")
print "META/otakeys.txt has no keys; using", mapped_keys[0]
# recovery uses a version of the key that has been slightly
# predigested (by DumpPublicKey.java) and put in res/keys.