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

Merge "Add quote to the signing arguments when passing to apexer"

This commit is contained in:
Baligh Uddin 2020-01-31 22:37:46 +00:00 committed by Gerrit Code Review
parent 0a6022e781 0e38d64e49
commit 2c2b9b4d64
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/apex_utils.py
View File

@ -157,8 +157,10 @@ class ApexApkSigner(object):
os.getenv('PATH')] os.getenv('PATH')]
for key, val in arguments_dict.items(): for key, val in arguments_dict.items():
repack_cmd.extend(['--' + key, val]) repack_cmd.extend(['--' + key, val])
# Add quote to the signing_args as we will pass
# --signing_args "--signing_helper_with_files=%path" to apexer
if signing_args: if signing_args:
repack_cmd.extend(['--signing_args', signing_args]) repack_cmd.extend(['--signing_args', '"{}"'.format(signing_args)])
# optional arguments for apex repacking # optional arguments for apex repacking
manifest_json = os.path.join(apex_dir, 'apex_manifest.json') manifest_json = os.path.join(apex_dir, 'apex_manifest.json')
if os.path.exists(manifest_json): if os.path.exists(manifest_json):

2
tools/releasetools/test_apex_utils.py
View File

@ -189,7 +189,7 @@ class ApexUtilsTest(test_utils.ReleaseToolsTestCase):
signing_helper = os.path.join(self.testdata_dir, 'signing_helper.sh') signing_helper = os.path.join(self.testdata_dir, 'signing_helper.sh')
os.chmod(signing_helper, 0o700) os.chmod(signing_helper, 0o700)
payload_signer_args = '--signing_helper_with_files {}'.format( payload_signer_args = '--signing_helper_with_files={}'.format(
signing_helper) signing_helper)
signer.ProcessApexFile(apk_keys, self.payload_key, payload_pubkey, signer.ProcessApexFile(apk_keys, self.payload_key, payload_pubkey,
payload_signer_args) payload_signer_args)