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

autoninja: Read default use_siso variable from .gn

Browse Source 
This CL allows non-Chromium projects to enable Siso by default via
`.gn`.

How to determine use_siso default:
1) If //build/config/siso/.sisoenv doesn't exist, use Ninja.
2) If it's not on corp machine, use Ninja.
3) If .gn specifies use_siso=True, use Siso.
4) If //build/config/gclient_args.gni specifies
`build_with_chromium = true`, use Siso.
5) If the build dir has already used Siso, use Siso.
Otherwise, use Ninja.

Note that the condition 4) will be removed after Chromium specifies
use_siso=true in .gn and waits for a while.

Bug: 409223168
Change-Id: I05d36b0e4e0c50cca8a1587135724ec837f4ee36
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6585977
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Junji Watanabe <jwata@google.com>
Auto-Submit: Junji Watanabe <jwata@google.com>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
This commit is contained in:
Junji Watanabe
2025-05-25 23:06:39 -07:00
committed by LUCI CQ
parent e0ece52cfb
commit a8900cc0f0
1 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
autoninja.py
View File

@@ -169,46 +169,50 @@ def _get_remoteexec_defaults():
return values
def _siso_supported(output_dir):
root_dir = gclient_paths.GetPrimarySolutionPath()
if not root_dir:
return False
sisoenv_path = os.path.join(root_dir, "build/config/siso/.sisoenv")
if not os.path.exists(sisoenv_path):
return False
# If it's not chromium project, use Ninja.
gclient_args_gni = os.path.join(root_dir, "build/config/gclient_args.gni")
if not os.path.exists(gclient_args_gni):
return False
with open(gclient_args_gni) as f:
if "build_with_chromium = true" not in f.read():
return False
# Use Siso by default for Googlers working on corp machine.
if _is_google_corp_machine():
return True
# Otherwise, use Ninja, until we are ready to roll it out
# on non-corp machines, too.
# TODO(378078715): enable True by default.
return False
# `use_siso` value is used to determine whether siso or ninja is used,
# and used to determine default value of `use_reclient`, so
# this logic should match with //build/toolchain/siso.gni
def _get_use_siso_default(output_dir):
"""Returns use_siso default value."""
if not _siso_supported(output_dir):
root_dir = gclient_paths.GetPrimarySolutionPath()
if not root_dir:
return False
# autoninja requires .sisoenv to set Siso env vars such as SISO_PROJECT
# and SISO_REAPI_INSTANCE.
sisoenv_path = os.path.join(root_dir, "build/config/siso/.sisoenv")
if not os.path.exists(sisoenv_path):
return False
# Use Siso by default on Googlers on corp machine for now.
# TODO: crbug.com/409223168 - Enable Siso by default for external devs.
if not _is_google_corp_machine():
return False
# Check the project wide default in `.gn`.
dot_gn = os.path.join(root_dir, ".gn")
if os.path.exists(dot_gn):
with open(dot_gn) as f:
dot_gn_lines = f.readlines()
p = re.compile(r"(^|\s*)(use_siso)\s*=\s*(true)\s*$")
if any(p.match(l) for l in dot_gn_lines):
return True
# Checking `build_with_chromium` var in //build/config/gclient_args.gni
# to enable Siso on Chromium.
# TODO: crbug.com/409223168 - Remove this condition after setting use_siso
# in Chromium's .gn + some buffer.
gclient_args_gni = os.path.join(root_dir, "build/config/gclient_args.gni")
if os.path.exists(gclient_args_gni):
with open(gclient_args_gni) as f:
if "build_with_chromium = true" in f.read():
return True
# This output directory is already using Siso.
if os.path.exists(os.path.join(output_dir, ".siso_deps")):
return True
# This output directory is still using Ninja.
if os.path.exists(os.path.join(output_dir, ".ninja_deps")):
print(_SISO_SUGGESTION.format(output_dir=output_dir), file=sys.stderr)
return False
return True
return False
def _main_inner(input_args, build_id, should_collect_logs=False):
@@ -307,6 +311,15 @@ def _main_inner(input_args, build_id, should_collect_logs=False):
if use_siso is None:
use_siso = _get_use_siso_default(output_dir)
# If use_siso is True by default, but the output directory is still using
# Ninja, print the suggestion message.
is_ninja_used = os.path.exists(
os.path.join(output_dir, ".ninja_deps"))
if use_siso and is_ninja_used:
print(_SISO_SUGGESTION.format(output_dir=output_dir),
file=sys.stderr)
use_siso = False
if use_reclient is None:
if use_remoteexec:
values = _get_remoteexec_defaults()