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

build/scripts/master/factory/chromium_factory.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.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import re
 
@@ skipping 52 matching lines @@
 def FixForGomaWin(options, target, gclient_env):
   """Fix gyp variables required for goma on Windows,
   unless it is already set.
 
   Args:
     options: a list of string for factory options.
     target: a string of build target (e.g. Debug, Release).
     gclient_env: a dict for gclient_env.
   """
   options = options or {}
-  if (not '--compiler=goma' in options and
-      not '--compiler=goma-clang' in options):
+  if ('--compiler=goma' not in options and
+      '--compiler=goma-clang' not in options):
     return
   gyp_defines = gclient_env.get('GYP_DEFINES', '')
   # goma couldn't work with pdbserv.
   if 'fastbuild=1' not in gyp_defines and 'win_z7=1' not in gyp_defines:
     if target.startswith('Debug'):
       gyp_defines += ' win_z7=1'
     else:
       gyp_defines += ' fastbuild=1'
   # goma couldn't handle precompiled headers.
   if 'chromium_win_pch=0' not in gyp_defines:
     gyp_defines += ' chromium_win_pch=0'
   gclient_env['GYP_DEFINES'] = gyp_defines
 
 
+def SetGomaGypDefines(options, gclient_env, target_platform):
+  """Adds goma flags to GYP_DEFINES."""
+  options = options or {}
+  if ('--compiler=goma' not in options and
+      '--compiler=goma-clang' not in options and
+      '--compiler=jsonclang' not in options):
+    return
+  if target_platform == 'win32':
+    gomadir = r'C:\b\build\goma'
+  else:
+    gomadir = '/b/build/goma'

[iannucci, 2014/04/08 20:45:50]

!!!!!! :(

This terrifies me (and won't actually work on half of the slaves)... is there a
way to not do this? Why can't we discover this path in gyp_chromium if use_goma
is set but gomadir is not?

[Nico, 2014/04/08 20:51:09]

We could add a gyp_chromium wrapper script. It's correct for the slaves I looked
at though, so I figured maybe we could get away without doing that.

Which slaves does this not work for?

+  gyp_defines = gclient_env.get('GYP_DEFINES', '')
+  gyp_defines += ' use_goma=1 gomadir=%s' % gomadir
+  gclient_env['GYP_DEFINES'] = gyp_defines
+
+
 class ChromiumFactory(gclient_factory.GClientFactory):
   """Encapsulates data and methods common to the chromium master.cfg files."""
 
   DEFAULT_TARGET_PLATFORM = config.Master.default_platform
 
   MEMORY_TOOLS_GYP_DEFINES = 'build_for_tool=memcheck'
 
   # gclient custom vars
   CUSTOM_VARS_GOOGLECODE_URL = ('googlecode_url', config.Master.googlecode_url)
   CUSTOM_VARS_SOURCEFORGE_URL = ('sourceforge_url',
@@ skipping 882 matching lines @@
       # revision in their filename. For this to work correctly, the testers
       # need to be on a Triggerable that's activated by their builder.
       factory_properties.setdefault('webkit_dir', 'third_party/WebKit/Source')
 
     factory_properties['gclient_env'] = \
         factory_properties.get('gclient_env', {}).copy()
     # Defaults gyp to VS2010.
     if self._target_platform == 'win32':
       factory_properties['gclient_env'].setdefault('GYP_MSVS_VERSION', '2010')
       FixForGomaWin(options, target, factory_properties['gclient_env'])
+    SetGomaGypDefines(
+        options, factory_properties['gclient_env'], self._target_platform)
     tests = tests or []
 
     if factory_properties.get('needs_valgrind'):
       self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_VALGRIND]
     elif factory_properties.get('needs_tsan_win'):
       self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_TSAN_WIN]
     elif factory_properties.get('needs_drmemory'):
       if 'drmemory.DEPS' not in [s.name for s in self._solutions]:
         self._solutions.append(gclient_factory.GClientSolution(
             config.Master.trunk_url +
@@ skipping 388 matching lines @@
                             mode=None, slave_type='BuilderTester', options=None,
                             compile_timeout=1200, build_url=None, project=None,
                             factory_properties=None):
     # Make sure the solution is not already there.
     if 'cros_deps' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)