Commit 684460d2 authored by Michael Savigny's avatar Michael Savigny Committed by LUCI CQ

Add remote-disabled support for reclient in autoninja.

In addition to setting GOMA_DISABLED, this CL also sets the
RBE_remote_disabled environment variable to autoninja.

Bug: 1149386
Change-Id: I9aa8be005a9cd473b7371eadcab83d6068e0e070
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2565550Reviewed-by: 's avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Michael Savigny <msavigny@google.com>
parent f1176059
...@@ -18,9 +18,15 @@ set scriptdir=%~dp0 ...@@ -18,9 +18,15 @@ set scriptdir=%~dp0
:loop :loop
IF NOT "%1"=="" ( IF NOT "%1"=="" (
@rem Tell goma to not do network compiles. @rem Tell goma or reclient to not do network compiles.
IF "%1"=="--offline" SET GOMA_DISABLED=1 IF "%1"=="--offline" (
IF "%1"=="-o" SET GOMA_DISABLED=1 SET GOMA_DISABLED=1
SET RBE_remote_disabled=1
)
IF "%1"=="-o" (
SET GOMA_DISABLED=1
SET RBE_remote_disabled=1
)
SHIFT SHIFT
GOTO :loop GOTO :loop
) )
......
...@@ -161,9 +161,9 @@ if os.environ.get('NINJA_SUMMARIZE_BUILD', '0') == '1': ...@@ -161,9 +161,9 @@ if os.environ.get('NINJA_SUMMARIZE_BUILD', '0') == '1':
args += ['-d', 'stats'] args += ['-d', 'stats']
if offline and not sys.platform.startswith('win'): if offline and not sys.platform.startswith('win'):
# Tell goma to do local compiles. On Windows this environment variable is set # Tell goma or reclient to do local compiles. On Windows these environment
# by the wrapper batch file. # variables are set by the wrapper batch file.
print('GOMA_DISABLED=1 ' + ' '.join(args)) print('RBE_remote_disabled=1 GOMA_DISABLED=1 ' + ' '.join(args))
else: else:
print(' '.join(args)) print(' '.join(args))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment