Set use_goma=1 and gomadir=path in GYP_DEFINES on master.

build/scripts/master/factory/commands.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Set of utilities to add commands to a buildbot factory (BuildFactory).
 
 All the utility functions to add steps to a build factory here are not
 project-specific. See the other *_commands.py for project-specific commands.
 """
 
@@ skipping 326 matching lines @@
       # the start of a build. But the kill_processes (taskkill) step has to use
       # the original python.exe, or it kills itself.
       self._python = 'python_slave'
     else:
       self._python = 'python'
 
     self.working_dir = 'build'
     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')
     self._extract_tool = self.PathJoin(self._script_dir, 'extract_build.py')
     self._cleanup_temp_tool = self.PathJoin(self._script_dir, 'cleanup_temp.py')
     self._bot_update_tool = self.PathJoin(self._script_dir, 'bot_update.py')
     self._resource_sizes_tool = self.PathJoin(self._script_dir,
                                               'resource_sizes.py')
     self._gclient_safe_revert_tool = self.PathJoin(self._script_dir,
                                                    'gclient_safe_revert.py')
@@ skipping 600 matching lines @@
         chromium_step.AnnotatedCommand,
         name='bot_update',
         description='bot_update',
         haltOnFailure=True,
         flunkOnFailure=True,
         timeout=600,
         workdir=self.working_dir,
         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'
     env['DEPOT_TOOLS_UPDATE'] = '0'
     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,
         name='runhooks',
         description='gclient hooks',
         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_gclient_branch=None):
     """This is not for pressing 'clobber' on the waterfall UI page. This is
        for clobbering all the sources. Using mode='clobber' causes the entire
        working directory to get moved aside (to build.dead) --OR-- if
        build.dead already exists, it deletes build.dead. Strange, but true.
        See GClient.doClobber() (for move vs. delete logic) or Gclient.start()
        (for mode='clobber' trigger) in chromium_commands.py.
@@ skipping 297 matching lines @@
 
   def commandComplete(self, cmd):
     out = cmd.logs['stdio'].getText()
     build_properties = re.findall('BUILD_PROPERTY ([^=]*)=(.*)', out)
     for propname, value in build_properties:
       # findall can return strings containing CR characters, remove with strip.
       self.build.setProperty(propname, value.strip(), 'Step')
 
   def getText(self, cmd, results):
     return self.describe(True) + self.messages