Merge "Fix error in payload_signer_args passing" into main am: 703b4830dc
am: 323c046d44
Original change: https://android-review.googlesource.com/c/platform/build/+/3267753 Change-Id: Ibd1987e27ba1e4a86bc4112866f880e004bd1590 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -184,6 +184,7 @@ import re
|
||||
import shutil
|
||||
import stat
|
||||
import sys
|
||||
import shlex
|
||||
import tempfile
|
||||
import zipfile
|
||||
from xml.etree import ElementTree
|
||||
@@ -589,7 +590,7 @@ def GetOtaSigningArgs():
|
||||
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:
|
||||
|
Reference in New Issue
Block a user