Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Unified Diff: build/scripts/master/factory/commands.py

Issue 228903003: Set use_goma=1 and gomadir=path in GYP_DEFINES on master. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/scripts/master/factory/commands.py
===================================================================
--- build/scripts/master/factory/commands.py (revision 263733)
+++ build/scripts/master/factory/commands.py (working copy)
@@ -344,6 +344,7 @@
self._repository_root = repository_root
self._kill_tool = self.PathJoin(self._script_dir, 'kill_processes.py')
+ self._runhooks_tool = self.PathJoin(self._script_dir, 'runhooks_wrapper.py')
self._compile_tool = self.PathJoin(self._script_dir, 'compile.py')
self._test_tool = self.PathJoin(self._script_dir, 'runtest.py')
self._zip_tool = self.PathJoin(self._script_dir, 'zip_build.py')
@@ -964,7 +965,7 @@
command=cmd)
- def AddRunHooksStep(self, env=None, timeout=None):
+ def AddRunHooksStep(self, env=None, timeout=None, options=None):
"""Adds a step to the factory to run the gclient hooks."""
env = env or {}
env['LANDMINES_VERBOSE'] = '1'
@@ -972,6 +973,13 @@
env['CHROMIUM_GYP_SYNTAX_CHECK'] = '1'
if timeout is None:
timeout = 60*10
+ cmd = [self._python, self._runhooks_tool]
+
+ options = options or {}
+ if ('--compiler=goma' in options or '--compiler=goma-clang' in options or
+ '--compiler=jsonclang' in options):
+ cmd.append('--use-goma')
+
self._factory.addStep(
RunHooksShell,
haltOnFailure=True,
@@ -980,7 +988,7 @@
env=env,
locks=[self.slave_exclusive_lock],
timeout=timeout,
- command=['gclient', 'runhooks'])
+ command=cmd)
def AddClobberTreeStep(self, gclient_spec, env=None, timeout=None,
gclient_deps=None, gclient_nohooks=False,
« no previous file with comments | « no previous file | build/scripts/master/factory/gclient_factory.py » ('j') | build/scripts/slave/runhooks_wrapper.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698