Merge "Fix error in payload_signer_args passing" into main am: 703b4830dc

Original change: https://android-review.googlesource.com/c/platform/build/+/3267753

Change-Id: I3ed6d85a1f1199ecf891722609ecf5e17928b6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-13 18:07:17 +00:00
committed by Automerger Merge Worker

View File

@@ -184,6 +184,7 @@ import re
import shutil import shutil
import stat import stat
import sys import sys
import shlex
import tempfile import tempfile
import zipfile import zipfile
from xml.etree import ElementTree from xml.etree import ElementTree
@@ -589,7 +590,7 @@ def GetOtaSigningArgs():
if OPTIONS.payload_signer: if OPTIONS.payload_signer:
args.extend(["--payload_signer=" + OPTIONS.payload_signer]) args.extend(["--payload_signer=" + OPTIONS.payload_signer])
if OPTIONS.payload_signer_args: 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: if OPTIONS.search_path:
args.extend(["--search_path", OPTIONS.search_path]) args.extend(["--search_path", OPTIONS.search_path])
if OPTIONS.payload_signer_maximum_signature_size: if OPTIONS.payload_signer_maximum_signature_size: