Re-land "Flip remaining CQ Win builders to GN."

tools/mb/mb_config.pyl

 # Copyright 2015 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.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 215 matching lines @@
       'Win LKGR (DrM)': 'gn_release_drmemory_drfuzz_x86',
       'Win 10 Fast Ring': 'gn_release_trybot_x64',
     },
 
     'chromium.gpu': {
       # These all use the 'trybot' mixins to ensure that dcheck is on.
       'GPU Mac Builder': 'swarming_gpu_tests_gyp_release_trybot',
       'GPU Mac Builder (dbg)': 'swarming_gpu_tests_gyp_debug_trybot',
       'GPU Linux Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_tests_gn_release_trybot',
-      'GPU Win Builder': 'swarming_gpu_tests_gyp_release_trybot_x86',
-      'GPU Win Builder (dbg)': 'swarming_gpu_tests_gyp_debug_trybot_x86',
+      'GPU Win Builder': 'swarming_gpu_tests_gn_release_trybot_x86',
+      'GPU Win Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot_x86',
       'Linux Debug (NVIDIA)': 'none',
       'Linux Release (NVIDIA)': 'none',
       'Mac 10.10 Debug (Intel)': 'none',
       'Mac 10.10 Release (Intel)': 'none',
       'Mac 10.10 Retina Debug (AMD)': 'none',
       'Mac 10.10 Retina Release (AMD)': 'none',
       'Win7 Debug (NVIDIA)': 'none',
       'Win7 Release (ATI)': 'none',
       'Win7 Release (NVIDIA)': 'none',
     },
@@ skipping 338 matching lines @@
       'Mac Tester': 'none',
       'Win Builder': 'chrome_with_codecs_blink_logging_gyp_release_trybot_x86',
       'Win x64 GN (dbg)': 'gn_debug_bot_minimal_symbols_chrome_with_codecs',
       'Win x64 GN': 'gn_release_bot_minimal_symbols_chrome_with_codecs',
       'Win10 Tester': 'none',
       'Win7 Tester': 'none',
     },
 
     'chromium.win': {
       # Windows bots take too long to link w/ full symbols and time out.
-      'Win Builder': 'swarming_gyp_release_bot_minimal_symbols_x86',
-      'Win Builder (dbg)': 'swarming_gyp_debug_bot_minimal_symbols_x86',
+      'Win Builder': 'swarming_gn_release_bot_minimal_symbols_x86',
+      'Win Builder (dbg)': 'swarming_gn_debug_bot_minimal_symbols_x86',
       'Win x64 Builder': 'swarming_gn_release_bot_minimal_symbols_x64',
       'Win x64 Builder (dbg)': 'swarming_gn_debug_bot_minimal_symbols_x64',
       'Win 7 Tests x64 (1)': 'none',
       'Win10 Tests x64': 'none',
       'Win7 (32) Tests': 'none',
       'Win7 Tests (1)': 'none',
       'Win7 Tests (dbg)(1)': 'none',
       'Win8 Aura': 'gn_release_bot_minimal_symbols_x86',
       'Win8 GN (dbg)': 'gn_debug_bot_minimal_symbols_x86',
       'WinClang64 (dbg)': 'win_clang_debug_bot',
@@ skipping 232 matching lines @@
     },
 
     'tryserver.chromium.win': {
       'win10_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
       'win10_chromium_x64_rel_ng_exp': 'swarming_gn_release_trybot_x64',
       'win8_chromium_gn_dbg': 'swarming_gn_debug_trybot_x86',
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86',
       'win8_chromium_ng': 'gn_release_trybot_x86',
       'win_x64_archive': 'noswarming_gyp_release_trybot_x64',
       'win_archive': 'noswarming_gyp_release_trybot_x86',
-      'win_chromium_compile_dbg_ng': 'swarming_gyp_debug_trybot_x86',
+      'win_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot_x86',
       'win_chromium_compile_rel_ng':
-        'swarming_gpu_tests_gyp_release_trybot_x86',
-      'win_chromium_dbg_ng': 'swarming_gyp_debug_trybot_x86',
-      'win_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot_x86',
+        'swarming_gpu_tests_gn_release_trybot_x86',
+      'win_chromium_dbg_ng': 'swarming_gn_debug_trybot_x86',
+      'win_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot_x86',
       'win_chromium_syzyasan_rel': 'swarming_gyp_syzyasan_release_trybot_x86',
       'win_chromium_variable': 'findit',
       'win_chromium_variable_archive': 'findit',
       'win_chromium_variable_chrome': 'findit',
       'win_chromium_variable_gn': 'findit',
       'win_chromium_variable_webkit_builder': 'findit',
       'win_chromium_variable_webkit_layout': 'findit',
       'win_chromium_variable_webkit_win7_builder': 'findit',
       'win_chromium_variable_webkit_win7_builder_x64': 'findit',
       'win_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
@@ skipping 662 matching lines @@
     ],
 
     'swarming_gn_debug_bot_minimal_symbols_x64': [
       'swarming', 'gn', 'debug_bot_minimal_symbols', 'x64',
     ],
 
     'swarming_gn_debug_bot_x86': [
       'swarming', 'gn', 'debug_bot', 'x86',
     ],
 
+    'swarming_gn_debug_bot_minimal_symbols_x86': [
+      'swarming', 'gn', 'debug_bot_minimal_symbols', 'x86',
+    ],
+
     'swarming_gn_debug_trybot': [
       'swarming', 'gn', 'debug_trybot',
     ],
 
     'swarming_gn_debug_trybot_x86': [
       'swarming', 'gn', 'debug_trybot', 'x86',
     ],
 
     'swarming_gn_msan_release_bot': [
       'swarming', 'gn', 'msan', 'release_bot',
     ],
 
     'swarming_gn_release_bot': [
       'swarming', 'gn', 'release_bot',
     ],
 
     'swarming_gn_release_bot_arm': [
       'swarming', 'gn', 'release_bot', 'arm', 'crosscompile',
     ],
 
     'swarming_gn_release_bot_minimal_symbols': [
       'swarming', 'gn', 'release_bot_minimal_symbols',
     ],
 
     'swarming_gn_release_bot_minimal_symbols_x64': [
       'swarming', 'gn', 'release_bot_minimal_symbols', 'x64',
     ],
 
+    'swarming_gn_release_bot_minimal_symbols_x86': [
+      'swarming', 'gn', 'release_bot_minimal_symbols', 'x86',
+    ],
+
     'swarming_gn_release_bot_x64': [
       'swarming', 'gn', 'release_bot', 'x64',
     ],
 
     'swarming_gn_release_trybot': [
       'swarming', 'gn', 'release_bot',
     ],
 
     'swarming_gn_release_trybot_x64': [
       'swarming', 'gn', 'release_trybot', 'x64',
@@ skipping 46 matching lines @@
 
     'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86': [
       'swarming', 'gpu_tests', 'angle_deqp_tests',
       'internal_gles2_conform_tests', 'gyp', 'release_trybot', 'x86',
     ],
 
     'swarming_gpu_tests_gn_debug_trybot': [
       'swarming', 'gpu_tests', 'gn', 'debug_trybot',
     ],
 
+    'swarming_gpu_tests_gn_debug_trybot_x86': [
+      'swarming', 'gpu_tests', 'gn', 'debug_trybot', 'x86',
+    ],
+
     'swarming_gpu_tests_gn_release_trybot': [
       'swarming', 'gpu_tests', 'gn', 'release_trybot',
     ],
 
+    'swarming_gpu_tests_gn_release_trybot_x86': [
+      'swarming', 'gpu_tests', 'gn', 'release_trybot', 'x86',
+    ],
+
     'swarming_gpu_tests_gyp_debug_trybot': [
       'swarming', 'gpu_tests', 'gyp', 'debug_trybot',
     ],
 
-    'swarming_gpu_tests_gyp_debug_trybot_x86': [
-      'swarming', 'gpu_tests', 'gyp', 'debug_trybot', 'x86',
-    ],
-
     'swarming_gpu_tests_gyp_release_bot': [
       'swarming', 'gpu_tests', 'gyp', 'release_bot',
     ],
 
     'swarming_gpu_tests_gyp_release_bot_minimal_symbols_x86': [
       'swarming', 'gpu_tests', 'gyp', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
     'swarming_gpu_tests_gyp_release_bot_x86': [
       'swarming', 'gpu_tests', 'gyp', 'release_bot',
     ],
 
     'swarming_gpu_tests_gyp_release_trybot': [
       'swarming', 'gpu_tests', 'gyp', 'release_trybot',
     ],
 
-    'swarming_gpu_tests_gyp_release_trybot_x86': [
-      'swarming', 'gpu_tests', 'gyp', 'release_trybot', 'x86',
-    ],
-
     ('swarming_gyp_asan_clang_edge_fuzzer'
          '_static_v8_heap_x86_full_symbols_release'): [
       'swarming', 'gyp', 'asan', 'clang_tot', 'edge', 'fuzzer', 'static',
       'v8_heap', 'full_symbols', 'release',
     ],
 
     'swarming_gyp_asan_clang_fuzzer_shared_v8_heap_x86_full_symbols_release': [
       'swarming', 'gyp', 'asan', 'clang_tot', 'fuzzer', 'shared', 'v8_heap',
       'full_symbols', 'release',
     ],
@@ skipping 629 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }