Stop passing --build-tool=ninja in master configs

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 229 matching lines @@
 
   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'

[Nico, 2016/06/23 16:58:28]

GYP_GENERATORS has defaulted to ninja for desktop chromes for a long time (and
mobile chromes don't use this factory)

 
     # 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, options=options)
 
@@ skipping 124 matching lines @@
 
     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, options=options)