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

Merge "A custom APEX signing tool with --signing_args"

Browse Source
This commit is contained in:
Jooyung Han
2022-02-08 11:23:24 +00:00
committed by Gerrit Code Review
parent de88a91b43 39259ec1a4
commit 3a61599999
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/releasetools/apex_utils.py
View File

@@ -102,14 +102,14 @@ class ApexApkSigner(object):
' %s', entry) ' %s', entry)
payload_dir, has_signed_content = self.ExtractApexPayloadAndSignContents( payload_dir, has_signed_content = self.ExtractApexPayloadAndSignContents(
apk_entries, apk_keys, payload_key) apk_entries, apk_keys, payload_key, signing_args)
if not has_signed_content: if not has_signed_content:
logger.info('No contents has been signed in %s', self.apex_path) logger.info('No contents has been signed in %s', self.apex_path)
return self.apex_path return self.apex_path
return self.RepackApexPayload(payload_dir, payload_key, signing_args) return self.RepackApexPayload(payload_dir, payload_key, signing_args)
def ExtractApexPayloadAndSignContents(self, apk_entries, apk_keys, payload_key): def ExtractApexPayloadAndSignContents(self, apk_entries, apk_keys, payload_key, signing_args):
"""Extracts the payload image and signs the containing apk files.""" """Extracts the payload image and signs the containing apk files."""
if not os.path.exists(self.debugfs_path): if not os.path.exists(self.debugfs_path):
raise ApexSigningError( raise ApexSigningError(
@@ -143,7 +143,12 @@ class ApexApkSigner(object):
if self.sign_tool: if self.sign_tool:
logger.info('Signing payload contents in apex %s with %s', self.apex_path, self.sign_tool) logger.info('Signing payload contents in apex %s with %s', self.apex_path, self.sign_tool)
cmd = [self.sign_tool, '--avbtool', self.avbtool, payload_key, payload_dir] # Pass avbtool to the custom signing tool
cmd = [self.sign_tool, '--avbtool', self.avbtool]
# Pass signing_args verbatim which will be forwarded to avbtool (e.g. --signing_helper=...)
if signing_args:
cmd.extend(['--signing_args', '"{}"'.format(signing_args)])
cmd.extend([payload_key, payload_dir])
common.RunAndCheckOutput(cmd) common.RunAndCheckOutput(cmd)
has_signed_content = True has_signed_content = True