Flip many of the remaining Mac GYP 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 84 matching lines @@
       'Android Builder (dbg)': 'android_gn_debug_static_bot',
       'Browser Side Navigation Linux': 'gn_release_bot',
       'CFI Linux CF': 'gn_cfi_full_cfi_diag_release_static',
       'CFI Linux ToT': 'gn_cfi_full_clang_tot_release_static',
       'CFI Linux': 'gn_cfi_release_static',
       'CFI Linux Full': 'gn_cfi_full_release_static',
       'Chromium Linux Goma Canary': 'gn_release_bot',
       'Chromium Linux Goma Canary (clobber)': 'gn_release_bot',
       'Chromium Linux Precise Goma LinkTest': 'gn_release_bot',
       'Chromium Linux32 Goma Canary (clobber)': 'gn_release_bot_x86',
-      'Chromium Mac 10.10 MacViews': 'mac_views_browser_gyp_release_bot',
-      'Chromium Mac 10.11': 'gyp_release_bot',
-      'Chromium Mac 10.11 Force Mac Toolchain': 'gyp_release_bot',
-      'Chromium Mac 10.9 Goma Canary': 'gyp_release_bot',
-      'Chromium Mac 10.9 Goma Canary (clobber)': 'gyp_release_bot',
-      'Chromium Mac 10.9 Goma Canary (dbg)': 'gyp_debug_bot',
-      'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'gyp_debug_bot',
+      'Chromium Mac 10.10 MacViews': 'mac_views_browser_gn_release_bot',
+      'Chromium Mac 10.11': 'gn_release_bot',
+      'Chromium Mac 10.11 Force Mac Toolchain': 'gn_release_bot',
+      'Chromium Mac 10.9 Goma Canary': 'gn_release_bot',
+      'Chromium Mac 10.9 Goma Canary (clobber)': 'gn_release_bot',
+      'Chromium Mac 10.9 Goma Canary (dbg)': 'gn_debug_bot',
+      'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'gn_debug_bot',
       'Chromium Win PGO Builder': 'gyp_official_winpgo',
       'Chromium Win x64 PGO Builder': 'gyp_official_winpgo_x64',
       'Chromium Windows Analyze': 'gn_windows_analyze',
       'CrWin7Goma': 'gn_release_bot_minimal_symbols_x86',
       'CrWin7Goma(clbr)': 'gn_shared_release_bot_minimal_symbols_x86',
       'CrWin7Goma(dbg)': 'gn_debug_bot_minimal_symbols_x86',
       'CrWin7Goma(dll)': 'gn_shared_release_bot_minimal_symbols_x86',
       'CrWinClang':
         'swarming_gn_clang_official_release_bot_minimal_symbols_x86',
       'CrWinClang(dbg)':
@@ skipping 13 matching lines @@
         'swarming_gn_clang_tot_linux_full_symbols_shared_release',
       'ClangToTLinux tester': 'none',
       'ClangToTLinux (dbg)': 'swarming_clang_tot_shared_debug',
       'ClangToTLinuxASan': 'swarming_gn_clang_tot_asan_lsan_static_release',
       'ClangToTLinuxASan tester': 'none',
       'ClangToTLinuxLLD': 'swarming_clang_tot_lld_release_shared',
       'ClangToTLinuxLLD tester': 'none',
       'ClangToTLinuxUBSanVptr':
         'swarming_gn_clang_tot_edge_ubsan_no_recover_hack_static_release',
       'ClangToTLinuxUBSanVptr tester': 'none',
-      'ClangToTMac': 'swarming_gyp_clang_tot_minimal_symbols_shared_release',
+      'ClangToTMac': 'swarming_gn_clang_tot_minimal_symbols_shared_release',
       'ClangToTMac tester': 'none',
       'ClangToTMac (dbg)':
-        'swarming_gyp_clang_tot_minimal_symbols_shared_debug',
+        'swarming_gn_clang_tot_minimal_symbols_shared_debug',
       'ClangToTMacASan':
         'swarming_gyp_asan_clang_tot_full_symbols_static_release',
       'ClangToTMacASan tester': 'none',
       'ClangToTWin':
         'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x86',
       'ClangToTWin tester': 'none',
       'ClangToTWin(dbg)':
         'swarming_gn_clang_tot_minimal_symbols_shared_debug_x86',
       'ClangToTWin(dbg) tester': 'none',
       'ClangToTWin(dll)':
@@ skipping 634 matching lines @@
       'linux_upload_clang': 'gn_release_bot',
     },
 
     'tryserver.chromium.mac': {
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
       'ios-simulator-cronet': '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_10.10_macviews': 'mac_views_browser_gn_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_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',
@@ skipping 485 matching lines @@
     ],
 
     'gn_chromeos_with_codecs_debug_bot': [
       'gn', 'chromeos_with_codecs', 'debug_bot',
     ],
 
     'gyp_clang_minimal_symbols_shared_release_bot_x86': [
       'gyp', 'clang', 'minimal_symbols', 'shared_release_bot', 'x86',
     ],
 
-    'gyp_debug_bot': [
-      'gyp', 'debug_bot',
-    ],
-
     'gyp_debug_bot_minimal_symbols_x64': [
       'gyp', 'debug_bot_minimal_symbols', 'x64',
     ],
 
     'gn_debug_bot_minimal_symbols_x86': [
       'gn', 'debug_bot_minimal_symbols', 'x86',
     ],
 
     'gyp_drmemory_shared_release_x86': [
       'gyp', 'drmemory', 'shared', 'release', 'x86',
@@ skipping 42 matching lines @@
     ],
 
     'gyp_official_x64': [
       'gyp', 'official', 'x64',
     ],
 
     'gyp_official_x64_six_concurrent_links': [
       'gyp', 'official', 'x64', 'six_concurrent_links',
     ],
 
-    'gyp_release_bot': [
-      'gyp', 'release_bot',
-    ],
-
     'gyp_release_bot_minimal_symbols_x86': [
       'gyp', 'release_bot_minimal_symbols', 'x86'
     ],
 
     'gyp_release_trybot_x86': [
       'gyp', 'release_trybot', 'x86',
     ],
 
     'gn_shared_release_bot_minimal_symbols_x86': [
       'gn', 'shared_release_bot', 'minimal_symbols', 'x86',
@@ skipping 21 matching lines @@
 
     # The 'ios' configs are just used for auditing. iOS bots
     # actually use the ios recipes, not the chromium recipe, and look
     # up their GYP or GN arguments via files checked in under //ios/build/bots.
     # It is an error to actually use one of these configs to generate the
     # build files.
     'ios_gn': [ 'gn', 'error'],
 
     'ios_gyp': ['gyp', 'error'],
 
-    'mac_views_browser_gyp_release_bot': [
-      'mac_views_browser', 'gyp', 'release_bot',
+    'mac_views_browser_gn_release_bot': [
+      'mac_views_browser', 'gn', 'release_bot',
     ],
 
-    'mac_views_browser_gyp_release_trybot': [
-      'mac_views_browser', 'gyp', 'release_trybot',
+    'mac_views_browser_gn_release_trybot': [
+      'mac_views_browser', 'gn', 'release_trybot',
     ],
 
     # This is used for tracking purposes; any bot that uses this config
     # should never actually run MB.
     'none': [
       'error',
     ],
 
     'noswarming_gn_debug_bot_x64': [
       'noswarming', 'gn', 'debug_bot', 'x64',
@@ skipping 346 matching lines @@
       'swarming', 'gn', 'clang_tot', 'edge', 'ubsan_no_recover_hack',
       'static', 'release',
     ],
 
     'swarming_gn_clang_tot_linux_full_symbols_shared_release': [
       # Enable debug info, as on official builders, to catch issues with
       # optimized debug info.
       'swarming', 'gn', 'clang_tot', 'full_symbols', 'shared', 'release',
     ],
 
-    'swarming_gyp_clang_tot_minimal_symbols_shared_debug': [
-      'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
+    'swarming_gn_clang_tot_minimal_symbols_shared_debug': [
+      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_debug_use_lld_x64': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'use_lld', 'x64',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_debug_use_lld_x86': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'use_lld', 'x86',
@@ skipping 12 matching lines @@
     'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x64': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'use_lld', 'x64',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x86': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'use_lld', 'x86',
     ],
 
-    'swarming_gyp_clang_tot_minimal_symbols_shared_release': [
-      'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
+    'swarming_gn_clang_tot_minimal_symbols_shared_release': [
+      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'release',
     ],
 
     'swarming_gn_clang_tot_minimal_symbols_shared_release_x64': [
       'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'x64',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_release_x86': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'x86',
@@ skipping 489 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',
     },
   },
 }