StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip"

Browse Source
This commit is contained in:
Jacky Liu
2022-01-06 06:31:37 +00:00
committed by Gerrit Code Review
parent 790214a4c9 beb0b6927c
commit bff997fd1f
6 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/releasetools/sign_target_files_apks.py
View File

@@ -888,14 +888,27 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
except KeyError:
raise common.ExternalError("can't read META/otakeys.txt from input")
extra_recovery_keys = misc_info.get("extra_recovery_keys")
if extra_recovery_keys:
extra_ota_keys_info = misc_info.get("extra_ota_keys")
if extra_ota_keys_info:
extra_ota_keys = [OPTIONS.key_map.get(k, k) + ".x509.pem"
for k in extra_ota_keys_info.split()]
print("extra ota key(s): " + ", ".join(extra_ota_keys))
else:
extra_ota_keys = []
for k in extra_ota_keys:
if not os.path.isfile(k):
raise common.ExternalError(k + " does not exist or is not a file")
extra_recovery_keys_info = misc_info.get("extra_recovery_keys")
if extra_recovery_keys_info:
extra_recovery_keys = [OPTIONS.key_map.get(k, k) + ".x509.pem"
for k in extra_recovery_keys.split()]
if extra_recovery_keys:
print("extra recovery-only key(s): " + ", ".join(extra_recovery_keys))
for k in extra_recovery_keys_info.split()]
print("extra recovery-only key(s): " + ", ".join(extra_recovery_keys))
else:
extra_recovery_keys = []
for k in extra_recovery_keys:
if not os.path.isfile(k):
raise common.ExternalError(k + " does not exist or is not a file")
mapped_keys = []
for k in keylist:
@@ -918,13 +931,20 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
mapped_keys.append(mapped_devkey + ".x509.pem")
print("META/otakeys.txt has no keys; using %s for OTA package"
" verification." % (mapped_keys[0],))
for k in mapped_keys:
if not os.path.isfile(k):
raise common.ExternalError(k + " does not exist or is not a file")
otacerts = [info
for info in input_tf_zip.infolist()
if info.filename.endswith("/otacerts.zip")]
for info in otacerts:
print("Rewriting OTA key:", info.filename, mapped_keys)
WriteOtacerts(output_tf_zip, info.filename, mapped_keys)
if info.filename.startswith(("BOOT/", "RECOVERY/", "VENDOR_BOOT/")):
extra_keys = extra_recovery_keys
else:
extra_keys = extra_ota_keys
print("Rewriting OTA key:", info.filename, mapped_keys + extra_keys)
WriteOtacerts(output_tf_zip, info.filename, mapped_keys + extra_keys)
def ReplaceVerityPublicKey(output_zip, filename, key_path):