openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Write back default_system_dev_certificate." am: ff87a9f9d9 

am: b55251898d

Change-Id: Ia2b4dc9f853d60f272b494b0d71be4a91383cfb6
This commit is contained in:
Tao Bao 2017-11-09 23:58:03 +00:00 committed by android-build-merger
parent 53d6df9c25 b55251898d
commit 3b71247a2e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/sign_target_files_apks.py
View File

@ -444,7 +444,7 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
except KeyError: except KeyError:
raise common.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) extra_recovery_keys = misc_info.get("extra_recovery_keys")
if extra_recovery_keys: if extra_recovery_keys:
extra_recovery_keys = [OPTIONS.key_map.get(k, k) + ".x509.pem" extra_recovery_keys = [OPTIONS.key_map.get(k, k) + ".x509.pem"
for k in extra_recovery_keys.split()] for k in extra_recovery_keys.split()]
@ -468,8 +468,10 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
else: else:
devkey = misc_info.get("default_system_dev_certificate", devkey = misc_info.get("default_system_dev_certificate",
"build/target/product/security/testkey") "build/target/product/security/testkey")
mapped_keys.append( mapped_devkey = OPTIONS.key_map.get(devkey, devkey)
OPTIONS.key_map.get(devkey, devkey) + ".x509.pem") if mapped_devkey != devkey:
misc_info["default_system_dev_certificate"] = mapped_devkey
mapped_keys.append(mapped_devkey + ".x509.pem")
print("META/otakeys.txt has no keys; using %s for OTA package" print("META/otakeys.txt has no keys; using %s for OTA package"
" verification." % (mapped_keys[0],)) " verification." % (mapped_keys[0],))