mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 10:41:31 +00:00
Add a new possible siso path
We are relocating siso binary from third_party/siso/siso to third_party/siso/cipd/siso to make it compatible with Cog, which requires cipd packages to be placed in directories with no Git content. Bug: 346837573 Change-Id: If40e6033e341dcedfee5670f07d68c14bd923f7b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5625091 Reviewed-by: Philipp Wollermann <philwo@google.com> Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
This commit is contained in:
15
siso.py
15
siso.py
@@ -103,11 +103,16 @@ def main(args):
|
||||
for line in f.readlines():
|
||||
k, v = line.rstrip().split('=', 1)
|
||||
env[k] = v
|
||||
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)
|
||||
siso_paths = [
|
||||
siso_override_path,
|
||||
os.path.join(base_path, 'third_party', 'siso', 'cipd',
|
||||
'siso' + gclient_paths.GetExeSuffix()),
|
||||
os.path.join(base_path, 'third_party', 'siso',
|
||||
'siso' + gclient_paths.GetExeSuffix()),
|
||||
]
|
||||
for siso_path in siso_paths:
|
||||
if siso_path and os.path.isfile(siso_path):
|
||||
return subprocess.call([siso_path] + args[1:], env=env)
|
||||
|
||||
print(
|
||||
'depot_tools/siso.py: Could not find .sisoenv under build/config/siso '
|
||||
|
||||
Reference in New Issue
Block a user