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

fix signing user builds

Browse source 
When unzipping a target-files which has been signed with OTA key
replacement, you'll get "overwrite this file?" prompts because the key
files appear in the zip files twice.  Suppress these prompts.

Many developer phone products don't define PRODUCT_OTA_PUBLIC_KEYS, so
add a default key.

This change doesn't affect device code.
This commit is contained in:
Doug Zongker 2009-08-20 17:38:42 -07:00
parent 6f7ba2dce2
commit e05628cc8d
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

@ -144,7 +144,7 @@ def UnzipTemp(filename):
tmp = tempfile.mkdtemp(prefix="targetfiles-") tmp = tempfile.mkdtemp(prefix="targetfiles-")
OPTIONS.tempfiles.append(tmp) 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() p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise ExternalError("failed to unzip input target-files \"%s\"" % raise ExternalError("failed to unzip input target-files \"%s\"" %

9
tools/releasetools/sign_target_files_apks
View file

@ -272,8 +272,13 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip):
k = m.group(1) k = m.group(1)
mapped_keys.append(OPTIONS.key_map.get(k, k) + ".x509.pem") mapped_keys.append(OPTIONS.key_map.get(k, k) + ".x509.pem")
print "using:\n ", "\n ".join(mapped_keys) if mapped_keys:
print "for OTA package verification" 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 # recovery uses a version of the key that has been slightly
# predigested (by DumpPublicKey.java) and put in res/keys. # predigested (by DumpPublicKey.java) and put in res/keys.