Switch the Linux bots on chromium.webkit to use Ninja.

masters/master.chromium.webkit/master_linux_latest_cfg.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.
 
 
 from master import master_config
 from master.factory import chromium_factory
 
 defaults = {}
 
@@ skipping 21 matching lines @@
 # Linux Rel tests
 #
 B('Linux Tests', 'f_linux_tests_rel', scheduler='s9_webkit_rel')
 F('f_linux_tests_rel', linux().ChromiumWebkitLatestFactory(
     tests=[
       'browser_tests',
       'content_browsertests',
       'interactive_ui',
       'unit',
     ],
-    options=['--compiler=goma'],
-    factory_properties={'generate_gtest_json': True}))
+    options=[
+      '--build-tool=ninja',
+      '--compiler=goma'
+    ],
+    factory_properties={
+      'generate_gtest_json': True,
+      'gclient_env': { 'GYP_GENERATORS': 'ninja' },
+    }))
 
 linux_aura_options = [
   'aura_builder',
   'base_unittests',
   'browser_tests',
   'cacheinvalidation_unittests',
   'compositor_unittests',
   'content_browsertests',
   'content_unittests',
   'crypto_unittests',
@@ skipping 13 matching lines @@
 ]
 
 B('Linux Aura', 'f_linux_aura_rel', scheduler='s9_webkit_rel')
 F('f_linux_aura_rel', linux().ChromiumWebkitLatestFactory(
     tests=[
       'aura',
       # This seems to have many failures
       #'content_browsertests',
       'unit',
     ],
-    options=['--compiler=goma'] + linux_aura_options,
+    options=[
+      '--build-tool=ninja',
+      '--compiler=goma',
+    ] + linux_aura_options,
     factory_properties={
       'generate_gtest_json': True,
-      'gclient_env': {'GYP_DEFINES': 'use_aura=1'}
+      'gclient_env': {'GYP_DEFINES': 'use_aura=1', 'GYP_GENERATORS': 'ninja'}
     }))
 
 B('Linux Perf', 'f_linux_perf_rel', scheduler='s9_webkit_rel')
 F('f_linux_perf_rel', linux().ChromiumWebkitLatestFactory(
-    options=['--compiler=goma', 'chromium_builder_perf'],
+    options=[
+      '--build-tool=ninja',
+      '--compiler=goma',
+      'chromium_builder_perf'
+    ],
     tests=[
       'dom_perf',
       'dromaeo',
       'page_cycler_bloat-http',
       'page_cycler_database',
       'page_cycler_dhtml',
       'page_cycler_indexeddb',
       'page_cycler_intl1',
       'page_cycler_intl2',
       'page_cycler_morejs',
       'page_cycler_moz',
       'page_cycler_moz-http',
       'startup',
       'sunspider'
     ],
-    factory_properties={'perf_id': 'chromium-rel-linux-webkit',
-                        'show_perf_results': True,}))
+    factory_properties={
+      'perf_id': 'chromium-rel-linux-webkit',
+      'show_perf_results': True,
+      'gclient_env': { 'GYP_GENERATORS': 'ninja' },
+    }))
 
 valgrind_gyp_defines = chromium_factory.ChromiumFactory.MEMORY_TOOLS_GYP_DEFINES
 B('Linux Valgrind', 'f_linux_valgrind_rel', scheduler='s9_webkit_rel')
 F('f_linux_valgrind_rel', linux().ChromiumWebkitLatestFactory(
-    options=['--compiler=goma', 'test_shell', 'test_shell_tests'],
+    options=[
+      '--build-tool=ninja',
+      '--compiler=goma',
+      'test_shell',
+      'test_shell_tests'],
     tests=['valgrind_test_shell'],
     factory_properties={
-        'needs_valgrind': True,
-        'gclient_env': {'GYP_DEFINES' : valgrind_gyp_defines,}}))
+      'needs_valgrind': True,
+      'gclient_env': {
+        'GYP_DEFINES' : valgrind_gyp_defines,
+        'GYP_GENERATORS': 'ninja',
+      },
+    }))
 
 
 def Update(config, active_master, c):
   return helper.Update(c)