commit e2b7599437a4c6d21738b6364d3727c260c9766a
author Kelvin Zhang <zhangkelvin@google.com> Fri Sep 13 09:49:17 2024 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Fri Sep 13 16:53:33 2024 +0000
tree af8153555d12d7cb5c2ae3a83e971bf955aebd02
parent 71565fb07014bc8d1b57974798245aa3cb71ad32

Fix error in payload_signer_args passing

payload_signer_args is a list returned from shlex.split, need to unparse
it before passing to shell CLI

Test: th
Bug: 354019928
Change-Id: I4d308557b5bb808bf34c9d4514408c21176c81f6

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: