Flip full, perf Mac and Win 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
     # include a configuration with 'chrome_with_codecs' since these builders
     # generated publicly advertised non-Official builds which are not allowed
     # to have proprietary codecs enabled.
     'chromium': {
       'Android': 'android_without_codecs_gn_release_bot_minimal_symbols',
       'Linux x64': 'noswarming_gn_release_bot',
-      'Mac': 'noswarming_gn_release_bot_mac_strip',
-      'Win': 'noswarming_gn_release_bot_minimal_symbols_x86',
+      'Mac': 'noswarming_gyp_release_bot_mac_strip',
+      'Win': 'noswarming_gyp_release_bot_minimal_symbols_x86',
       'Win x64': 'noswarming_gn_release_bot_minimal_symbols_x64',
     },
 
     'chromium.android': {
       'Android Cronet ARM64 Builder':
           'android_cronet_gn_release_bot_minimal_symbols_arm64',
       'Android Cronet ARM64 Builder (dbg)':
           'android_cronet_gn_debug_static_bot_arm64',
       'Android Cronet ARMv6 Builder':
           'android_cronet_gn_release_bot_minimal_symbols_armv6',
@@ skipping 434 matching lines @@
       'Mac 10.10 Perf (1)': 'none',
       'Mac 10.10 Perf (2)': 'none',
       'Mac 10.10 Perf (3)': 'none',
       'Mac 10.10 Perf (4)': 'none',
       'Mac 10.10 Perf (5)': 'none',
       'Mac 10.11 Perf (1)': 'none',
       'Mac 10.11 Perf (2)': 'none',
       'Mac 10.11 Perf (3)': 'none',
       'Mac 10.11 Perf (4)': 'none',
       'Mac 10.11 Perf (5)': 'none',
-      'Mac Builder': 'gn_official_goma',
+      'Mac Builder': 'gyp_official_goma',
       'Mac HDD Perf (1)': 'none',
       'Mac HDD Perf (2)': 'none',
       'Mac HDD Perf (3)': 'none',
       'Mac HDD Perf (4)': 'none',
       'Mac HDD Perf (5)': 'none',
       'Mac Retina Perf (1)': 'none',
       'Mac Retina Perf (2)': 'none',
       'Mac Retina Perf (3)': 'none',
       'Mac Retina Perf (4)': 'none',
       'Mac Retina Perf (5)': 'none',
@@ skipping 27 matching lines @@
       'Win 7 x64 Perf (1)': 'none',
       'Win 7 x64 Perf (2)': 'none',
       'Win 7 x64 Perf (3)': 'none',
       'Win 7 x64 Perf (4)': 'none',
       'Win 7 x64 Perf (5)': 'none',
       'Win 8 Perf (1)': 'none',
       'Win 8 Perf (2)': 'none',
       'Win 8 Perf (3)': 'none',
       'Win 8 Perf (4)': 'none',
       'Win 8 Perf (5)': 'none',
-      'Win Builder': 'gn_official_goma_minimal_symbols_x86',
+      'Win Builder': 'gyp_official_goma_minimal_symbols_x86',
       'Win Zenbook Perf (1)': 'none',
       'Win Zenbook Perf (2)': 'none',
       'Win Zenbook Perf (3)': 'none',
       'Win Zenbook Perf (4)': 'none',
       'Win Zenbook Perf (5)': 'none',
       'Win x64 Builder': 'gn_official_goma_minimal_symbols_x64',
     },
 
     'client.v8.fyi': {
       'Android Builder': 'gn_official_goma_minimal_symbols_android',
@@ skipping 619 matching lines @@
     ],
 
     'gn_official_goma_minimal_symbols_x64': [
       'gn', 'official', 'goma', 'minimal_symbols', 'x64',
     ],
 
     'gn_official_goma_minimal_symbols_x86': [
       'gn', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
+    'gyp_official_goma_minimal_symbols_x86': [
+      'gyp', 'official', 'goma', 'minimal_symbols', 'x86',
+    ],
+
     'gn_release_bot': [
       'gn', 'release_bot',
     ],
 
     'gn_release_bot_chrome_with_codecs': [
       'gn', 'release_bot', 'chrome_with_codecs',
     ],
 
     'gn_release_bot_minimal_symbols_chrome_with_codecs': [
       'gn', 'release_bot_minimal_symbols', 'chrome_with_codecs',
@@ skipping 253 matching lines @@
     ],
 
     'noswarming_gn_release_bot_minimal_symbols_x64': [
       'noswarming', 'gn', 'release_bot', 'minimal_symbols', 'x64',
     ],
 
     'noswarming_gn_release_bot_minimal_symbols_x86': [
       'noswarming', 'gn', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
+    'noswarming_gyp_release_bot_minimal_symbols_x86': [
+      'noswarming', 'gyp', 'release_bot', 'minimal_symbols', 'x86',
+    ],
+
     'noswarming_gn_release_bot_x64': [
       'noswarming', 'gn', 'release_bot', 'x64',
     ],
 
     'noswarming_gn_release_bot_mac_strip': [
       'noswarming', 'gn', 'release_bot', 'mac_strip',
     ],
 
+    'noswarming_gyp_release_bot_mac_strip': [
+      'noswarming', 'gyp', 'release_bot', 'mac_strip',
+    ],
+
     'noswarming_gn_release_trybot_x64': [
       'noswarming', 'gn', 'release_trybot', 'x64',
     ],
 
     'noswarming_gn_release_trybot_x86': [
       'noswarming', 'gn', 'release_trybot', 'x86',
     ],
 
     'swarming_android_gn_debug_static_bot': [
       'swarming', 'android', 'gn', 'debug_static_bot',
@@ skipping 867 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',
     },
   },
 }