Flip more Mac 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
     # 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_gyp_release_bot_mac_strip',
+      'Mac': 'noswarming_gn_release_bot_mac_strip',
       'Win': 'noswarming_gn_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':
@@ skipping 28 matching lines @@
       'Lollipop Low-end Tester': 'android_gn_debug_static_bot',
       'Lollipop Phone Tester': 'android_gn_debug_static_bot',
       'Lollipop Tablet Tester': 'android_gn_debug_static_bot',
       'Marshmallow 64 bit Tester': 'android_gn_debug_static_bot_arm64',
       'Marshmallow Tablet Tester': 'android_gn_debug_static_bot',
     },
 
     'chromium.chrome': {
       'Google Chrome ChromeOS': 'gn_official_goma_chromeos',
       'Google Chrome Linux x64': 'gn_official_goma',
-      'Google Chrome Mac': 'gyp_official_goma',
+      'Google Chrome Mac': 'gn_official_goma',
       'Google Chrome Win': 'gn_official_goma_minimal_symbols_x86',
     },
 
     'chromium.chromiumos': {
       'ChromiumOS amd64-generic Compile': 'cros_chrome_sdk_gn',
       'ChromiumOS daisy Compile': 'cros_chrome_sdk_gn',
       'ChromiumOS x86-generic Compile': 'cros_chrome_sdk_gn',
       'Linux ChromiumOS Builder': 'swarming_chromeos_gn_release_bot',
       'Linux ChromiumOS Builder (dbg)': 'swarming_chromeos_gn_debug_bot',
       'Linux ChromiumOS Full': 'swarming_chromeos_gn_release_bot',
@@ skipping 380 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': 'gyp_official_goma',
+      'Mac Builder': 'gn_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 311 matching lines @@
         'swarming_gpu_fyi_tests_gn_release_trybot',
       'linux_site_isolation': 'gn_release_trybot',
       'linux_upload_clang': 'gn_release_bot',
     },
 
     'tryserver.chromium.mac': {
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
-      'mac_chromium_10.10_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
+      '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_gyp_release_trybot',
+      'mac_chromium_archive_rel_ng': 'noswarming_gn_release_trybot',
       '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_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',
       'mac_chromium_variable_layout': 'findit',
-      'mac_nacl_sdk': 'gyp_release_bot',
-      'mac_nacl_sdk_build': 'gyp_release_bot',
-      'mac_optional_gpu_tests_rel':
-        'swarming_gpu_fyi_tests_gyp_release_trybot',
+      'mac_nacl_sdk': 'gn_release_bot',
+      'mac_nacl_sdk_build': 'gn_release_bot',
+      'mac_optional_gpu_tests_rel': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'mac_upload_clang': 'gn_release_bot',
     },
 
     'tryserver.chromium.perf': {
       'android_arm64_perf_bisect_builder':
         'gn_official_goma_minimal_symbols_android_arm64',
       'android_fyi_perf_bisect': 'gn_official_goma_minimal_symbols_android',
       'android_nexus5X_perf_bisect':
         'gn_official_goma_minimal_symbols_android',
       'android_nexus5_perf_bisect': 'gn_official_goma_minimal_symbols_android',
@@ skipping 593 matching lines @@
     ],
 
     'noswarming_gn_release_bot_minimal_symbols_x86': [
       'noswarming', 'gn', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
     'noswarming_gn_release_bot_x64': [
       'noswarming', 'gn', 'release_bot', 'x64',
     ],
 
-    'noswarming_gyp_release_bot_mac_strip': [
-      'noswarming', 'gyp', 'release_bot', 'mac_strip',
+    'noswarming_gn_release_bot_mac_strip': [
+      'noswarming', 'gn', 'release_bot', 'mac_strip',
     ],
 
-    'noswarming_gyp_release_trybot': [
-      'noswarming', 'gyp', 'release_trybot',
+    'noswarming_gn_release_trybot': [
+      'noswarming', 'gn', 'release_trybot',
     ],
 
     'noswarming_gn_release_trybot_x64': [
       'noswarming', 'gn', 'release_trybot', 'x64',
     ],
 
     'noswarming_gn_release_trybot_x86': [
       'noswarming', 'gn', 'release_trybot', 'x86',
     ],
 
@@ skipping 233 matching lines @@
     ],
 
     '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_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 594 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',
     },
   },
 }