From 5cbc521beb5f57f2e065f0c6db2f1c203cbccbe6 Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Thu, 16 Nov 2023 02:38:31 +0000 Subject: [PATCH] autoninja.py: remove use_rbe support This arg was not used anymore. Change-Id: If578845fc3e200f4f23c8ca050542b92fcf13ef2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5035261 Commit-Queue: Fumitoshi Ukai Auto-Submit: Takuto Ikuta Commit-Queue: Takuto Ikuta Reviewed-by: Fumitoshi Ukai --- autoninja.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/autoninja.py b/autoninja.py index 5691843d45..af8417c55c 100755 --- a/autoninja.py +++ b/autoninja.py @@ -130,7 +130,6 @@ def main(args): use_goma = False use_remoteexec = False - use_rbe = False use_siso = False # Attempt to auto-detect remote build acceleration. We support gn-based @@ -138,7 +137,7 @@ def main(args): # builds where we look for rules.ninja. if os.path.exists(os.path.join(output_dir, 'args.gn')): for line in _gn_lines(output_dir, os.path.join(output_dir, 'args.gn')): - # use_goma, use_remoteexec, or use_rbe will activate build + # use_goma, or use_remoteexec will activate build # acceleration. # # This test can match multi-argument lines. Examples of this @@ -155,10 +154,6 @@ def main(args): line_without_comment): use_remoteexec = True continue - if re.search(r'(^|\s)(use_rbe)\s*=\s*true($|\s)', - line_without_comment): - use_rbe = True - continue if re.search(r'(^|\s)(use_siso)\s*=\s*true($|\s)', line_without_comment): use_siso = True @@ -293,7 +288,7 @@ def main(args): num_cores = multiprocessing.cpu_count() if not j_specified and not t_specified: - if not offline and (use_goma or use_remoteexec or use_rbe): + if not offline and (use_goma or use_remoteexec): args.append('-j') default_core_multiplier = 80 if platform.machine() in ('x86_64', 'AMD64'):