From 4992184cd1552d0818d51e5d89353232737e7167 Mon Sep 17 00:00:00 2001 From: Richard Wang Date: Mon, 19 Jun 2023 07:34:02 +0000 Subject: [PATCH] [autosiso] add SISO_PATH env var Bug: b/287895730 Change-Id: Ibbf658f802d46a14fc82a622f7f853dcadc25e5f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4624217 Reviewed-by: Philipp Wollermann Commit-Queue: Richard Wang --- siso.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/siso.py b/siso.py index e6135413c..8f6901012 100644 --- a/siso.py +++ b/siso.py @@ -41,6 +41,15 @@ def main(args): if gclient_root_path: gclient_src_root_path = os.path.join(gclient_root_path, 'src') + siso_override_path = os.environ.get('SISO_PATH') + if siso_override_path: + print('depot_tools/siso.py: Using Siso binary from SISO_PATH: %s.' % + siso_override_path) + if not os.path.isfile(siso_override_path): + print('depot_tools/siso.py: Could not find Siso at provided SISO_PATH.', + file=sys.stderr) + return 1 + for base_path in set( [primary_solution_path, gclient_root_path, gclient_src_root_path]): if not base_path: @@ -53,8 +62,8 @@ def main(args): for line in f.readlines(): k, v = line.rstrip().split('=', 1) env[k] = v - siso_path = os.path.join(base_path, 'third_party', 'siso', - 'siso' + gclient_paths.GetExeSuffix()) + siso_path = siso_override_path or os.path.join( + base_path, 'third_party', 'siso', 'siso' + gclient_paths.GetExeSuffix()) if os.path.isfile(siso_path): return subprocess.call([siso_path] + args[1:], env=env)