Flip mac and win "gn" builders back to GYP.

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 334 matching lines @@
         'gyp_asan_edge_fuzzer_v8_heap_release_bot_x86',
       'Win ASan Release Media':
         'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86',
       'Win ASan Release': 'gyp_asan_fuzzer_v8_heap_release_bot_x86',
       'Win SyzyASAN LKGR': 'gyp_syzyasan_no_pch_win_z7_x86',
     },
 
     'chromium.mac': {
       'Mac Builder': 'swarming_gpu_tests_gn_release_bot',
       'Mac Builder (dbg)': 'swarming_gn_debug_bot',
-      'Mac GN (dbg)': 'gn_debug_bot',
-      'Mac GN': 'gn_release_bot',
+      'Mac GN (dbg)': 'swarming_gyp_debug_bot',
+      'Mac GN': 'swarming_gyp_release_bot',
+      'Mac GYP (dbg)': 'swarming_gyp_debug_bot',
+      'Mac GYP': 'swarming_gyp_release_bot',
       'Mac10.10 Tests': 'none',
       'Mac10.11 Tests': 'none',
       'Mac10.9 Tests (dbg)': 'none',
       'Mac10.9 Tests': 'none',
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
     },
 
@@ skipping 235 matching lines @@
       # Windows bots take too long to link w/ full symbols and time out.
       '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',
+      'Win8 Aura': 'swarming_gyp_release_bot_minimal_symbols_x86',
+      'Win8 GN (dbg)': 'swarming_gyp_debug_bot_minimal_symbols_x86',
+      'Win8 GYP': 'swarming_gyp_release_bot_minimal_symbols_x86',
+      'Win8 GYP (dbg)': 'swarming_gyp_debug_bot_minimal_symbols_x86',
       'WinClang64 (dbg)': 'win_clang_debug_bot',
     },
 
     'official.desktop': {
       'blimp-engine': '//build/args/bots/official.desktop/blimp-engine.gn',
       'mac64': 'gyp_official',
       'precise64': 'gn_official',
 
       # Currently the official bots set mini_installer_official_deps=1
       # but it's not clear if that's actually used anywhere.
@@ skipping 163 matching lines @@
       'ios-simulator': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
       'mac_chromium_10.10_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_10.10_macviews': 'mac_views_browser_gyp_release_trybot',
       'mac_chromium_archive_rel_ng': 'noswarming_gn_release_bot_mac_strip',
       'mac_chromium_asan_rel_ng': 'swarming_asan_dcheck_gyp_release_bot',
       'mac_chromium_asan_variable': 'findit',
       'mac_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
       'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_dbg_ng': 'swarming_gn_debug_trybot',
-      'mac_chromium_gn_dbg': 'gn_debug_bot',
-      'mac_chromium_gn_rel': 'gn_release_trybot',
+      'mac_chromium_gn_dbg': 'swarming_gyp_debug_trybot',
+      'mac_chromium_gn_rel': 'swarming_gyp_release_trybot',
+      'mac_chromium_gyp_dbg': 'swarming_gyp_debug_trybot',
+      'mac_chromium_gyp_rel': 'swarming_gyp_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
       'mac_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_variable': 'findit',
       'mac_chromium_variable_10.10': 'findit',
       'mac_chromium_variable_10.10_layout': 'findit',
       'mac_chromium_variable_10.11': 'findit',
       'mac_chromium_variable_10.11_layout': 'findit',
       'mac_chromium_variable_archive': 'findit',
       'mac_chromium_variable_chrome': 'findit',
       'mac_chromium_variable_gn': 'findit',
@@ skipping 43 matching lines @@
       'winx64_bisect_builder': 'gn_official_goma_minimal_symbols_x64',
       'winx64_zen_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64ati_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64intel_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64nvidia_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
     },
 
     '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_dbg': 'swarming_gyp_debug_trybot_x86',
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86',
-      'win8_chromium_ng': 'gn_release_trybot_x86',
+      'win8_chromium_ng': 'swarming_gyp_release_trybot_x86',
+      'win8_chromium_gyp_dbg': 'swarming_gyp_debug_trybot_x86',
+      'win8_chromium_gyp_rel': 'swarming_gyp_release_trybot_x86',
       'win_x64_archive': 'noswarming_gn_release_trybot_x64',
       'win_archive': 'noswarming_gn_release_trybot_x86',
       'win_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot_x86',
       'win_chromium_compile_rel_ng':
         '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',
@@ skipping 315 matching lines @@
     ],
 
     'gn_release_trybot': [
       'gn', 'release_trybot',
     ],
 
     'gn_release_trybot_x64': [
       'gn', 'release_trybot', 'x64',
     ],
 
-    'gn_release_trybot_x86': [
-      'gn', 'release_trybot', 'x86',
-    ],
-
     'gn_windows_analyze': [
       'gn', 'no_symbols', 'disable_precompiled_headers',
       'shared', 'x86', 'win_analyze',
     ],
 
     'gn_ubsan_vptr_release_bot': [
       'gn', 'ubsan_vptr', 'ubsan_no_recover_hack', 'release_bot',
     ],
 
     'gyp_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid': [
@@ skipping 359 matching lines @@
     ],
 
     '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_gyp_release_bot_minimal_symbols_x86': [
+      'swarming', 'gyp', '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',
     ],
 
+    'swarming_gyp_debug_bot': [
+      'swarming', 'gyp', 'debug_bot',
+    ],
+
+    'swarming_gyp_debug_bot_minimal_symbols_x86': [
+      'swarming', 'gyp', 'debug_bot_minimal_symbols', 'x86',
+    ],
+
+    'swarming_gyp_debug_trybot': [
+      'swarming', 'gyp', 'debug_trybot',
+    ],
+
+    'swarming_gyp_debug_trybot_x86': [
+      'swarming', 'gyp', 'debug_trybot', 'x86',
+    ],
+
+    'swarming_gyp_release_bot': [
+      'swarming', 'gyp', 'release_bot',
+    ],
+
+    'swarming_gyp_release_trybot': [
+      'swarming', 'gyp', 'release_trybot',
+    ],
+
+    'swarming_gyp_release_trybot_x86': [
+      'swarming', 'gyp', 'release_trybot', 'x86',
+    ],
+
     'swarming_gpu_tests_android_gn_release_trybot': [
       'swarming', 'gpu_tests', 'android', 'gn', 'release_trybot',
     ],
 
     'swarming_gpu_fyi_tests_chromeos_gn_release_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
       'release_trybot', 'angle_deqp_tests', 'chromeos',
     ],
 
     'swarming_gpu_fyi_tests_gn_debug_trybot': [
@@ skipping 668 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',
     },
   },
 }