Make non-recipe builders that use MB work w/ goma properly.

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 1030 matching lines @@
     """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:
-      cmd.append('--use-goma')
-
     self._factory.addStep(
         shell.ShellCommand,
         haltOnFailure=True,
         name='runhooks',
         description='gclient hooks',
         env=env,
         locks=[self.slave_exclusive_lock],
         timeout=timeout,
         command=cmd)
 
   def AddGenerateBuildFilesStep(self, env=None, timeout=None, options=None,
                                 config_file_path=None, target=None):
+    options = options or []
     if not config_file_path:
       config_file_path = self.PathJoin(self._repository_root,
                                        'tools', 'mb', 'mb_config.pyl')
+
     cmd = [self._python, self._mb_tool, 'gen',
            '-m', WithProperties('%(mastername)s'),
            '-b', WithProperties('%(buildername)s'),
-           '--config-file', config_file_path,
-           '//out/%s' % target]
+           '--config-file', config_file_path]
+
+    if '--compiler=goma' in options or '--compiler=goma-clang' in options:
+      cmd += ['--goma-dir', self.PathJoin('..', '..', '..', '..', 'goma')]

[nodir, 2016/04/23 00:43:38]

ugh

+
+    cmd += ['//out/%s' % target]
 
     self._factory.addStep(
         shell.ShellCommand,
         haltOnFailure=True,
         name='generate_build_files',
         description='generate build files',
         env=env,
         locks=[self.slave_exclusive_lock],
         timeout=timeout,
         command=cmd)
@@ skipping 285 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