Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c2b9b4d authored by Baligh Uddin's avatar Baligh Uddin Committed by Gerrit Code Review
Browse files

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

parents 0a6022e7 0e38d64e

tools/releasetools/apex_utils.py

+3 −1
Original line number Diff line number Diff line
@@ -157,8 +157,10 @@ class ApexApkSigner(object): 
                  os.getenv('PATH')]

    for key, val in arguments_dict.items():

      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:

      repack_cmd.extend(['--signing_args', signing_args])

      repack_cmd.extend(['--signing_args', '"{}"'.format(signing_args)])

    # optional arguments for apex repacking

    manifest_json = os.path.join(apex_dir, 'apex_manifest.json')

    if os.path.exists(manifest_json):

tools/releasetools/test_apex_utils.py

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ class ApexUtilsTest(test_utils.ReleaseToolsTestCase): 


    signing_helper = os.path.join(self.testdata_dir, 'signing_helper.sh')

    os.chmod(signing_helper, 0o700)

    payload_signer_args = '--signing_helper_with_files {}'.format(

    payload_signer_args = '--signing_helper_with_files={}'.format(

        signing_helper)

    signer.ProcessApexFile(apk_keys, self.payload_key, payload_pubkey,

                           payload_signer_args)