Flip CrOS ozone 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',
       'Linux ChromiumOS GN (dbg)': 'chromeos_gn_debug_bot',
       'Linux ChromiumOS GN': 'chromeos_ozone_gn_release_bot',
       'Linux ChromiumOS Ozone Builder':
-          'swarming_chromeos_ozone_gyp_release_bot',
+          'swarming_chromeos_ozone_gn_release_bot',
       'Linux ChromiumOS Ozone Tests (1)': 'none',
       'Linux ChromiumOS Tests (1)': 'none',
       'Linux ChromiumOS Tests (dbg)(1)': 'none',
     },
 
     'chromium.fyi': {
       'Afl Upload Linux ASan': 'gn_release_afl_asan',
       'Android ChromeDriver Tests (dbg)': 'none',
       'Android Cloud Tests': 'android_gn_debug_static_bot_x86',
       'Android Remoting Tests': 'none',
@@ skipping 363 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 130 matching lines @@
       'Win7 (32) Tests': 'none',
       'Win7 Tests (1)': 'none',
       'Win7 Tests (dbg)(1)': 'none',
       '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',
+      'mac64': 'gn_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.
       'win': 'gn_official',
       'win-asan': 'gyp_official_syzyasan',
       'win-pgo': 'gyp_official_winpgo',
       'win64': 'gn_official_x64',
       'win64-pgo': 'gyp_official_winpgo_x64',
     },
 
     'official.desktop.continuous': {
       'mac beta': 'gyp_official',
       'mac stable': 'gyp_official',
-      'mac trunk': 'gyp_official',
+      'mac trunk': 'gn_official',
       'precise64 beta': 'gn_official',
       'precise64 stable': 'gn_official',
       'precise64 trunk': 'gn_official',
       'win beta': 'gyp_official_six_concurrent_links',
       'win stable': 'gyp_official_six_concurrent_links',
       'win trunk': 'gn_official_six_concurrent_links',
     },
 
     'tryserver.blink': {
       # Most tryservers should have '_trybot' in their config names, but
@@ skipping 88 matching lines @@
       'linux_chromium_chromeos_asan_variable': 'findit',
       'linux_chromium_chromeos_compile_dbg_ng':
         'swarming_chromeos_gn_debug_trybot',
       'linux_chromium_chromeos_compile_rel_ng':
         'swarming_chromeos_gn_release_trybot',
       'linux_chromium_chromeos_dbg_ng':
         'swarming_chromeos_gn_debug_trybot',
       'linux_chromium_chromeos_msan_rel_ng':
         'swarming_chromeos_msan_gn_release_bot',
       'linux_chromium_chromeos_ozone_rel_ng':
-        'swarming_chromeos_gyp_ozone_release_trybot',
+        'swarming_chromeos_gn_ozone_release_trybot',
       'linux_chromium_chromeos_rel_ng': 'swarming_chromeos_gn_release_trybot',
       'linux_chromium_chromeos_variable': 'findit',
       'linux_chromium_chromeos_variable_chrome': 'findit',
       'linux_chromium_clobber_rel_ng': 'gn_release_trybot',
       'linux_chromium_compile_dbg_32_ng': 'swarming_gn_debug_trybot_x86',
       'linux_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
       'linux_chromium_compile_rel_ng': 'swarming_gn_release_trybot',
       'linux_chromium_dbg_32_ng': 'swarming_gn_debug_trybot_x86',
       'linux_chromium_dbg_ng': 'swarming_gn_debug_trybot',
       'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot',
@@ skipping 668 matching lines @@
     ],
 
     '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 52 matching lines @@
     ],
 
     'swarming_chromeos_gn_debug_bot': [
       'swarming', 'chromeos_with_codecs', 'gn', 'debug_bot',
     ],
 
     'swarming_chromeos_gn_debug_trybot': [
       'swarming', 'chromeos_with_codecs', 'gn', 'debug_trybot',
     ],
 
-    'swarming_chromeos_gyp_ozone_release_trybot': [
-      'swarming', 'chromeos_with_codecs', 'gyp', 'ozone', 'release_trybot',
+    'swarming_chromeos_gn_ozone_release_trybot': [
+      'swarming', 'chromeos_with_codecs', 'gn', 'ozone', 'release_trybot',
     ],
 
     'swarming_chromeos_gn_release_bot': [
       'swarming', 'chromeos_with_codecs', 'gn', 'release_bot',
     ],
 
     'swarming_chromeos_gn_release_trybot': [
       'swarming', 'chromeos_with_codecs', 'gn', 'release_trybot',
     ],
 
     'swarming_chromeos_msan_gn_release_bot': [
       'swarming', 'chromeos', 'msan', 'gn', 'release_bot',
     ],
 
-    'swarming_chromeos_ozone_gyp_release_bot': [
-      'swarming', 'chromeos_with_codecs', 'ozone', 'gyp', 'release_bot',
+    'swarming_chromeos_ozone_gn_release_bot': [
+      'swarming', 'chromeos_with_codecs', 'ozone', 'gn', 'release_bot',
     ],
 
     'swarming_clang_tot_lld_release_shared': [
       # TODO(crbug.com/605819): Enable debug info in release builds.
       'swarming', 'gn', 'clang_tot', 'release', 'shared', 'use_lld',
     ],
 
     'swarming_clang_tot_shared_debug': [
       'swarming', 'gn', 'clang_tot', 'shared', 'debug',
     ],
@@ skipping 767 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',
     },
   },
 }