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

build/scripts/master/factory/gclient_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 classes to generate and manage a BuildFactory to be passed to a
 builder dictionary as the 'factory' member, for each builder in c['builders'].
 
 Specifically creates a base BuildFactory that will execute a gclient checkout
 first."""
 
@@ skipping 136 matching lines @@
     spec += ']'
 
     if self._target_os:
       spec += ';target_os = ["' + self._target_os + '"]'
 
     return spec
 
   def BaseFactory(self, gclient_spec=None, official_release=False,
                   factory_properties=None, build_properties=None,
                   delay_compile_step=False, sudo_for_remove=False,
-                  gclient_deps=None, slave_type=None):
+                  gclient_deps=None, slave_type=None, options=None):
     if gclient_spec is None:
       gclient_spec = self.BuildGClientSpec()
     factory_properties = factory_properties or {}
     factory = BuildFactory(build_properties)
     factory_cmd_obj = commands.FactoryCommands(factory,
         target_platform=self._target_platform)
     # First kill any svn.exe tasks so we can update in peace, and
     # afterwards use the checked-out script to kill everything else.
     if (self._target_platform == 'win32' and
         not factory_properties.get('no_kill')):
@@ skipping 39 matching lines @@
       no_gclient_branch = factory_properties.get('no_gclient_branch', False)
       factory_cmd_obj.AddClobberTreeStep(gclient_spec, env, timeout,
           gclient_deps=gclient_deps, gclient_nohooks=self._nohooks_on_update,
           no_gclient_branch=no_gclient_branch)
     else:
       # Revert the tree to a clean (unmodified) state.
       factory_cmd_obj.AddGClientRevertStep()
       if not delay_compile_step:
         self.AddUpdateStep(gclient_spec, factory_properties, factory,
                            slave_type, sudo_for_remove,
-                           gclient_deps=gclient_deps)
+                           gclient_deps=gclient_deps, options=options)
     return factory
 
   def BuildFactory(self, target='Release', clobber=False, tests=None, mode=None,
                    slave_type='BuilderTester', options=None,
                    compile_timeout=1200, build_url=None, project=None,
                    factory_properties=None, gclient_deps=None,
                    target_arch=None, skip_archive_steps=False):
     if factory_properties is None:
       factory_properties = {}
     factory_properties.setdefault('gclient_env', {})
     gclient_env = factory_properties['gclient_env']
     if options and '--build-tool=ninja' in options:
       gclient_env['GYP_GENERATORS'] = 'ninja'
-    if options and '--compiler=goma-clang' in options:
-      # Ninja needs CC and CXX set at gyp time.
-      gclient_env['CC'] = 'clang'
-      gclient_env['CXX'] = 'clang++'
 
     # Create the spec for the solutions
     gclient_spec = self.BuildGClientSpec(tests)
 
     # Initialize the factory with the basic steps.
     factory = self.BaseFactory(gclient_spec,
                                factory_properties=factory_properties,
                                slave_type=slave_type,
-                               gclient_deps=gclient_deps)
+                               gclient_deps=gclient_deps, options=options)
 
     # Optional repository root (default: 'src').
     repository_root = factory_properties.get('repository_root', 'src')
 
     # Get the factory command object to create new steps to the factory.
     factory_cmd_obj = commands.FactoryCommands(factory, target,
                                                self._build_dir,
                                                self._target_platform,
                                                target_arch,
                                                repository_root)
@@ skipping 60 matching lines @@
     set_properties = factory_properties.get('trigger_set_properties', {})
 
     # Propagate properties to the children if this is set in the factory.
     copy_properties = factory_properties.get('trigger_properties', [])
     factory.addStep(commands.CreateTriggerStep(
         trigger_name=trigger_name,
         trigger_copy_properties=copy_properties,
         trigger_set_properties=set_properties))
 
   def AddUpdateStep(self, gclient_spec, factory_properties, factory,
-                    slave_type, sudo_for_remove=False, gclient_deps=None):
+                    slave_type, sudo_for_remove=False, gclient_deps=None,
+                    options=None):
     if gclient_spec is None:
       gclient_spec = self.BuildGClientSpec()
     factory_properties = factory_properties or {}
 
     # Get the factory command object to add update step to the factory.
     factory_cmd_obj = commands.FactoryCommands(factory,
         target_platform=self._target_platform)
 
     # Get variables needed for the update.
     env = factory_properties.get('gclient_env', {})
@@ skipping 27 matching lines @@
         blink_config=blink_config)
 
     if slave_type in ('AnnotatedTrybot', 'CrosTrybot', 'Trybot', 'Bisect',
                       'TrybotTester', 'TrybotBuilder'):
       factory_cmd_obj.AddApplyIssueStep(
           timeout=timeout,
           server=config.Master.Master4.code_review_site,
           revision_mapping=self._revision_mapping)
 
     if not self._nohooks_on_update:
-      factory_cmd_obj.AddRunHooksStep(env=env, timeout=timeout)
+      factory_cmd_obj.AddRunHooksStep(env=env, timeout=timeout, options=options)