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 24 matching lines @@
       '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 Win PGO Builder': 'gyp_official_winpgo',
       'Chromium Win x64 PGO Builder': 'gyp_official_winpgo_x64',
       'Chromium Windows Analyze': 'gn_windows_analyze',
-      'CrWin7Goma': 'gyp_release_bot_minimal_symbols_x86',

[Robert Sesek, 2016/06/21 23:31:07]

Some Win stuff snuck in here too. May want to mention that in the CL
description.

[Dirk Pranke, 2016/06/21 23:32:34]

Whoops. It wasn't supposed to. Too many git branches pipelined ... will fix.

-      'CrWin7Goma(clbr)': 'gyp_shared_release_bot_minimal_symbols_x86',
-      'CrWin7Goma(dbg)': 'gyp_debug_bot_minimal_symbols_x86',
-      'CrWin7Goma(dll)': 'gyp_shared_release_bot_minimal_symbols_x86',
+      '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)':
         'swarming_gyp_clang_debug_bot_minimal_symbols_x86',
       'CrWinClang(dbg) tester': 'none',
       'CrWinClang64':
         'swarming_gyp_clang_official_release_bot_minimal_symbols_x64',
       'CrWinClang tester': 'none',
       'CrWinClang64(dll)':
         'swarming_gyp_clang_minimal_symbols_shared_release_bot_x64',
       'CrWinClangGoma': 'gyp_clang_minimal_symbols_shared_release_bot_x86',
-      'CrWinGoma': 'gyp_release_bot_minimal_symbols_x86',
-      'CrWinGoma(dll)': 'gyp_shared_release_bot_minimal_symbols_x86',
+      'CrWinGoma': 'gn_release_bot_minimal_symbols_x86',
+      'CrWinGoma(dll)': 'gn_shared_release_bot_minimal_symbols_x86',
       'ClangToTAndroidASan': 'android_clang_tot_asan',
       'ClangToTAndroidASan tester': 'none',
       'ClangToTLinux':
         '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',
@@ skipping 112 matching lines @@
       # These all use the 'trybot' mixins to ensure that dcheck is on.
       'Android Release (Nexus 5)': 'android_gn_release_trybot',
       'Android Release (Nexus 5X)': 'swarming_android_gn_release_trybot_arm64',
       'Android Release (Nexus 6)': 'android_gn_release_trybot',
       'Android Release (Nexus 6P)': 'android_gn_release_trybot_arm64',
       'Android Release (Nexus 9)': 'android_gn_release_trybot_arm64',
       'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'GPU Mac Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
-      'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
+      'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gn_release_trybot_x86',
       'GPU Win Builder (dbg)':
-        'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
+        'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x86',
       'GPU Win Clang Builder (dbg)':
         'swarming_gpu_fyi_tests_win_clang_debug_bot',
       'GPU Win x64 Builder':
-        'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x64',
+        'swarming_gpu_tests_deqp_gles_gn_release_trybot_x64',
       'GPU Win x64 Builder (dbg)':
-        'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x64',
+        'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x64',
       'Linux ChromiumOS Builder':
         'swarming_gpu_fyi_tests_chromeos_gn_release_trybot',
       'Linux Debug (NVIDIA)': 'none',
       'Linux Debug (New Intel)': 'none',
       'Linux Release (ATI)': 'none',
       'Linux Release (NVIDIA GeForce 730)': 'none',
       'Linux Release (NVIDIA)': 'none',
       'Linux Release (New Intel)': 'none',
       'Mac 10.10 Debug (ATI)': 'none',
       'Mac 10.10 Debug (Intel)': 'none',
@@ skipping 178 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 222 matching lines @@
 
     'tryserver.chromium.angle': {
       'android_angle_rel_ng':
         'swarming_gpu_tests_android_gn_release_trybot',
       'linux_angle_chromeos_rel_ng':
         'swarming_gpu_fyi_tests_chromeos_gn_release_trybot',
       'linux_angle_dbg_ng': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'linux_angle_rel_ng': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'mac_angle_dbg_ng': 'swarming_gpu_fyi_tests_gyp_debug_trybot',
       'mac_angle_rel_ng': 'swarming_gpu_fyi_tests_gyp_release_trybot',
-      'win_angle_dbg_ng': 'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
-      'win_angle_rel_ng': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
+      'win_angle_dbg_ng': 'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x86',
+      'win_angle_rel_ng': 'swarming_gpu_tests_deqp_gles_gn_release_trybot_x86',
       'win_angle_x64_dbg_ng':
-        'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x64',
+        'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x64',
       'win_angle_x64_rel_ng':
-        'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x64',
+        'swarming_gpu_tests_deqp_gles_gn_release_trybot_x64',
     },
 
     'tryserver.chromium.linux': {
       'blimp_linux_dbg':
         '//build/args/bots/chromium.linux/blimp_linux_dbg.gn',
       'Chromium Linux Codesearch Builder': 'codesearch_gn',
       'ChromiumOS Codesearch Builder': 'codesearch_gn',
       'cast_shell_linux': 'cast_gn_release_trybot',
       'chromeos_amd64-generic_variable': 'findit',
       'chromeos_amd64-generic_chromium_compile_only_ng': 'cros_chrome_sdk_gn',
@@ skipping 63 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_nacl_sdk': 'gn_release_bot',
+      'mac_nacl_sdk_build': 'gn_release_bot',
       'mac_optional_gpu_tests_rel':
-        'swarming_gpu_fyi_tests_gyp_release_trybot',
+        '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 58 matching lines @@
       'win_chromium_variable_webkit_win7_builder_x64': 'findit',
       'win_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
       'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'swarming_gyp_clang_debug_trybot_x86',
       'win_clang_rel': 'swarming_gyp_clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
       'win_clang_x64_rel': 'swarming_gyp_clang_official_release_trybot_x64',
       'win_nacl_sdk': 'gyp_release_bot_minimal_symbols_x86',
       'win_nacl_sdk_build': 'gyp_release_bot_minimal_symbols_x86',
       'win_optional_gpu_tests_rel':
-        'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
+        'swarming_gpu_tests_deqp_gles_gn_release_trybot_x86',
       'win_pgo': 'gyp_official_winpgo',
       'win_upload_clang': 'gn_release_bot',
       'win_chrome_official': 'gn_official_goma_minimal_symbols_x86',
       'win_x64_chromium_variable_builder': 'findit',
     },
 
     'tryserver.v8': {
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
       'v8_linux_blink_rel': 'swarming_gn_release_trybot_x64',
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
@@ skipping 381 matching lines @@
     ],
 
     'gyp_debug_bot': [
       'gyp', 'debug_bot',
     ],
 
     'gyp_debug_bot_minimal_symbols_x64': [
       'gyp', 'debug_bot_minimal_symbols', 'x64',
     ],
 
-    'gyp_debug_bot_minimal_symbols_x86': [
-      'gyp', 'debug_bot_minimal_symbols', 'x86',
+    'gn_debug_bot_minimal_symbols_x86': [
+      'gn', 'debug_bot_minimal_symbols', 'x86',
     ],
 
     'gyp_drmemory_shared_release_x86': [
       'gyp', 'drmemory', 'shared', 'release', 'x86',
     ],
 
     'gyp_drmemory_shared_release_x64': [
       'gyp', 'drmemory', 'shared', 'release', 'x64',
     ],
 
@@ skipping 44 matching lines @@
     ],
 
     'gyp_release_bot_minimal_symbols_x86': [
       'gyp', 'release_bot_minimal_symbols', 'x86'
     ],
 
     'gyp_release_trybot_x64': [
       'gyp', 'release_trybot', 'x64',
     ],
 
-    'gyp_shared_release_bot_minimal_symbols_x86': [
-      'gyp', 'shared_release_bot', 'minimal_symbols', 'x86',
+    'gn_shared_release_bot_minimal_symbols_x86': [
+      'gn', 'shared_release_bot', 'minimal_symbols', 'x86',
     ],
 
     'gyp_syzyasan_no_pch_win_z7_x86': [
       'gyp', 'syzyasan', 'no_pch', 'win_z7', 'x86',
     ],
 
     'gyp_tsan_disable_nacl_line_tables_debug_bot': [
       'gyp', 'tsan', 'disable_nacl', 'line_tables', 'debug_bot',
     ],
 
@@ skipping 45 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 166 matching lines @@
     'swarming_gpu_fyi_tests_gn_debug_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
       'debug_trybot', 'angle_deqp_tests',
     ],
 
     'swarming_gpu_fyi_tests_gn_release_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
       'release_trybot', 'angle_deqp_tests',
     ],
 
+    'swarming_gpu_fyi_tests_gyp_debug_trybot': [
+      'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
+      'debug_trybot', 'angle_deqp_tests',
+    ],
+
+    'swarming_gpu_fyi_tests_gyp_release_trybot': [
+      'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
+      'release_trybot', 'angle_deqp_tests',
+    ],
+
     'swarming_gpu_fyi_tests_win_clang_debug_bot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests',
       'gn', 'clang', 'debug_bot_minimal_symbols',
     ],
 
-    'swarming_gpu_fyi_tests_gyp_debug_trybot': [
-      'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
-      'debug_trybot',
+    'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x64': [
+      'swarming', 'gpu_tests', 'angle_deqp_tests',
+      'internal_gles2_conform_tests', 'gn', 'debug_trybot', 'x64',
     ],
 
-    'swarming_gpu_fyi_tests_gyp_release_trybot': [
-      'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
-      'release_trybot',
+    'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x86': [
+      'swarming', 'gpu_tests', 'angle_deqp_tests',
+      'internal_gles2_conform_tests', 'gn', 'debug_trybot', 'x86',
     ],
 
-    'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x64': [
+    'swarming_gpu_tests_deqp_gles_gn_release_trybot_x64': [
       'swarming', 'gpu_tests', 'angle_deqp_tests',
-      'internal_gles2_conform_tests', 'gyp', 'debug_trybot', 'x64',
+      'internal_gles2_conform_tests', 'gn', 'release_trybot', 'x64',
     ],
 
-    'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86': [
+    'swarming_gpu_tests_deqp_gles_gn_release_trybot_x86': [
       'swarming', 'gpu_tests', 'angle_deqp_tests',
-      'internal_gles2_conform_tests', 'gyp', 'debug_trybot', 'x86',
-    ],
-
-    'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x64': [
-      'swarming', 'gpu_tests', 'angle_deqp_tests',
-      'internal_gles2_conform_tests', 'gyp', 'release_trybot', 'x64',
-    ],
-
-    'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86': [
-      'swarming', 'gpu_tests', 'angle_deqp_tests',
-      'internal_gles2_conform_tests', 'gyp', 'release_trybot', 'x86',
+      'internal_gles2_conform_tests', 'gn', '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',
     ],
 
@@ skipping 14 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',
     },
   },
 }