InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have ninja flags be applied in more obvious manner.

Browse Source 
Bug: b/348530235
Change-Id: Idfac0789c4881a376678f749d0d20b3309fd240c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7136527
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Alex Ovsienko <ovsienko@google.com>
This commit is contained in:
Alex Ovsienko
2025-11-09 21:37:15 -08:00
committed by LUCI CQ
parent 2b4898e327
commit b26ab6e9d5
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
siso.py
View File

@@ -47,12 +47,6 @@ def check_outdir(subcmd, out_dir):
def apply_metrics_labels(args: list[str]) -> list[str]:
if not args:
return args
# We expect ninja calls, else this algorithm is meaningless.
if args[0] != "ninja":
return args
system_dict = {"Windows": "windows", "Darwin": "mac", "Linux": "linux"}
user_system = system_dict.get(platform.system(), platform.system())
@@ -71,9 +65,6 @@ def apply_metrics_labels(args: list[str]) -> list[str]:
def apply_telemetry_flags(args: list[str]) -> list[str]:
# Don't apply for non ninja runs.
if args[0] != "ninja":
return args
telemetry_flags = [
"enable_cloud_monitoring", "enable_cloud_profiler",
"enable_cloud_trace", "enable_cloud_logging"
@@ -242,9 +233,11 @@ def main(args, telemetry_cfg: Optional[build_telemetry.Config] = None):
if args[1:] != new_args:
print('depot_tools/siso.py: %s' % shlex.join(new_args),
file=sys.stderr)
new_args = apply_metrics_labels(new_args)
if should_collect_logs:
new_args = apply_telemetry_flags(new_args)
# Add ninja specific flags.
if args[0] == "ninja":
new_args = apply_metrics_labels(new_args)
if should_collect_logs:
new_args = apply_telemetry_flags(new_args)
return caffeinate.run([siso_path] + new_args, env=env)
print(
'depot_tools/siso.py: Could not find siso in third_party/siso '