commit 703b4830dc76ded483bf0cc39ebacaabc6cafcdc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 13 17:46:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 13 17:46:02 2024 +0000
tree 79f8ab3413b2d077534200e6633f0768278e74ec
parent 0eb513b222f96e6cb092471543429ac6e3f4c738
parent e2b7599437a4c6d21738b6364d3727c260c9766a

Merge "Fix error in payload_signer_args passing" into main

tools/releasetools/sign_target_files_apks.py

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 0254f37..4ad97e0 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -184,6 +184,7 @@
 import shutil
 import stat
 import sys
+import shlex
 import tempfile
 import zipfile
 from xml.etree import ElementTree
@@ -589,7 +590,7 @@
   if OPTIONS.payload_signer:
     args.extend(["--payload_signer=" + OPTIONS.payload_signer])
   if OPTIONS.payload_signer_args:
-    args.extend(["--payload_signer_args=" + OPTIONS.payload_signer_args])
+    args.extend(["--payload_signer_args=" + shlex.join(OPTIONS.payload_signer_args)])
   if OPTIONS.search_path:
     args.extend(["--search_path", OPTIONS.search_path])
   if OPTIONS.payload_signer_maximum_signature_size: