Make recipes use the new way of enabling goma.

scripts/slave/recipe_modules/chromium/config.py

 # Copyright 2013 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.
 
 from slave.recipe_config import config_item_context, ConfigGroup
 from slave.recipe_config import Dict, Single, Static, Set, BadConf
 from slave.recipe_config_types import Path
 
 # Because of the way that we use decorators, pylint can't figure out the proper
 # type signature of functions annotated with the @config_ctx decorator.
@@ skipping 14 matching lines @@
 def BaseConfig(HOST_PLATFORM, HOST_ARCH, HOST_BITS,
                TARGET_PLATFORM, TARGET_ARCH, TARGET_BITS,
                BUILD_CONFIG, **_kwargs):
   equal_fn = lambda tup: ('%s=%s' % tup)
   return ConfigGroup(
     compile_py = ConfigGroup(
       default_targets = Set(basestring),
       build_tool = Single(basestring),
       compiler = Single(basestring, required=False),
       mode = Single(basestring, required=False),
+      goma_dir = Single(Path, required=False),
       clobber = Single(bool, empty_val=False, required=False, hidden=False),
     ),
     gyp_env = ConfigGroup(
       GYP_CROSSCOMPILE = Single(int, jsonish_fn=str, required=False),
       GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,Path)),
       GYP_GENERATORS = Set(basestring, ','.join),
       GYP_GENERATOR_FLAGS = Dict(equal_fn, ' '.join, (basestring,int)),
       GYP_MSVS_VERSION = Single(basestring, required=False),
     ),
     build_dir = Single(Path),
@@ skipping 140 matching lines @@
     raise BadConf('goma doesn\'t work with msvs')
 
   # TODO(iannucci): support clang and jsonclang
   if not c.compile_py.compiler:
     c.compile_py.compiler = 'goma'
   elif c.compile_py.compiler == 'clang':
     c.compile_py.compiler = 'goma-clang'
   else:  # pragma: no cover
     raise BadConf('goma config dosen\'t understand %s' % c.compile_py.compiler)
 
+  c.gyp_env.GYP_DEFINES['use_goma'] = 1
+
+  goma_dir = Path('[BUILD]', 'goma')

[Nico, 2014/02/04 19:57:02]

To make sure: [BUILD] evaluates to the root of the buildbot dir, not the root of
chromium's build dire, yes?

[Paweł Hajdan Jr., 2014/02/04 20:40:15]

Yes. I tested this locally.

+  c.gyp_env.GYP_DEFINES['gomadir'] = goma_dir
+  c.compile_py.goma_dir = goma_dir
+
   if c.TARGET_PLATFORM == 'win':
     fastbuild(c)
     pch(c, invert=True)
 
 @config_ctx()
 def pch(c, invert=False):
   if c.TARGET_PLATFORM == 'win':
     c.gyp_env.GYP_DEFINES['chromium_win_pch'] = int(not invert)
 
 @config_ctx()
@@ skipping 103 matching lines @@
 @config_ctx(includes=['chromium_clang'])
 def blink_clang(c):
   c.compile_py.default_targets = ['blink_tests']
 
 @config_ctx(includes=['ninja', 'static_library', 'default_compiler', 'goma'])
 def android(c):
   gyp_defs = c.gyp_env.GYP_DEFINES
   gyp_defs['fastbuild'] = 1
   gyp_defs['OS'] = c.TARGET_PLATFORM
   gyp_defs['host_os'] = c.HOST_PLATFORM