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

scripts/master/factory/commands.py

Index: scripts/master/factory/commands.py
diff --git a/scripts/master/factory/commands.py b/scripts/master/factory/commands.py
index 2cf33a078fb62273b819cd9b0c907aaf2d552be6..676c3024e977b4793be1669f18f4a8c3d621abfd 100644
--- a/scripts/master/factory/commands.py
+++ b/scripts/master/factory/commands.py
@@ -1048,9 +1048,6 @@ class FactoryCommands(object):
     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,
@@ -1063,14 +1060,20 @@ class FactoryCommands(object):
 
   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,