Flip remaining non-ASAN Win Clang 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 115 matching lines @@
       ],
       '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',
       # if CrWinClang is modified, please update CrWinClangGoma in the same way.
       'CrWinClang':
         'swarming_gn_clang_official_release_bot_minimal_symbols_x86',
       'CrWinClang(dbg)':
-        'swarming_gyp_clang_debug_bot_minimal_symbols_x86',
+        'swarming_gn_clang_debug_bot_minimal_symbols_x86',
       'CrWinClang(dbg) tester': 'none',
       'CrWinClang64':
-        'swarming_gyp_clang_official_release_bot_minimal_symbols_x64',
+        'swarming_gn_clang_official_release_bot_minimal_symbols_x64',
       'CrWinClang tester': 'none',
       'CrWinClang64(dll)':
-        'swarming_gyp_clang_minimal_symbols_shared_release_bot_x64',
+        'swarming_gn_clang_minimal_symbols_shared_release_bot_x64',
       'CrWinClangGoma':
         'swarming_gn_clang_official_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',
       'ClangToTLinuxUBSanVptr':
         'swarming_gn_clang_tot_edge_ubsan_no_recover_hack_static_release',
       'ClangToTLinuxUBSanVptr tester': 'none',
       'ClangToTMac': 'swarming_gn_clang_tot_minimal_symbols_shared_release',
       'ClangToTMac tester': 'none',
       'ClangToTMac (dbg)':
         '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',
+        'swarming_gn_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)':
-        'swarming_gyp_clang_tot_minimal_symbols_shared_release_x86',
+        'swarming_gn_clang_tot_minimal_symbols_shared_release_x86',
       'ClangToTWin(dll) tester': 'none',
       'ClangToTWin64':
         'swarming_gn_clang_tot_official_minimal_symbols_static_release_x64',
       'ClangToTWin64 tester': 'none',
       'ClangToTWin64(dbg)':
-        'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x64',
+        'swarming_gn_clang_tot_minimal_symbols_shared_debug_x64',
       'ClangToTWin64(dbg) tester': 'none',
       'ClangToTWin64(dll)':
         'swarming_gn_clang_tot_minimal_symbols_shared_release_x64',
       'ClangToTWin64(dll) tester': 'none',
       'ClangToTiOS': 'ios_gyp',
       'Closure Compilation Linux': 'closure_compilation',
       'CrWinAsan':
        'swarming_gyp_asan_clang_fuzzer_static_v8_heap_x86_full_symbols_release',
       'CrWinAsan tester': 'none',
       'CrWinAsan(dll)':
        'swarming_gyp_asan_clang_fuzzer_shared_v8_heap_x86_full_symbols_release',
       'CrWinAsan(dll) tester': 'none',
       'CrWinAsanCov':
         ('swarming_gyp_asan_clang_edge_fuzzer'
           '_static_v8_heap_x86_full_symbols_release'),
       'CrWinAsanCov tester': 'none',
       'CrWinClang(shared)':
         'swarming_gn_clang_shared_release_bot_minimal_symbols_x86',
       'CrWinClang(shared) tester': 'none',
       'CrWinClang64 tester': 'none',
       'CrWinClang64(dbg)': 'win_clang_debug_bot',
       'CrWinClang64(dbg) tester': 'none',
       'CrWinClang64(dll) tester': 'none',
       'CrWinClangLLD':
-        'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x86',
+        'swarming_gn_clang_tot_minimal_symbols_shared_release_use_lld_x86',
       'CrWinClangLLD tester': 'none',
       'CrWinClangLLD64':
-        'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x64',
+        'swarming_gn_clang_tot_minimal_symbols_shared_release_use_lld_x64',
       'CrWinClangLLD64 tester': 'none',
       'CrWinClngLLD64dbg':
-        'swarming_gyp_clang_tot_minimal_symbols_shared_debug_use_lld_x64',
+        'swarming_gn_clang_tot_minimal_symbols_shared_debug_use_lld_x64',
       'CrWinClngLLD64dbg tester': 'none',
       'CrWinClngLLDdbg':
-        'swarming_gyp_clang_tot_minimal_symbols_shared_debug_use_lld_x86',
+        'swarming_gn_clang_tot_minimal_symbols_shared_debug_use_lld_x86',
       'CrWinClngLLDdbg tester': 'none',
       'EarlGreyiOS': 'ios_gyp',
       'Headless Linux (dbg)':
         '//build/args/bots/chromium.fyi/headless_linux_dbg.gn',
       'MD Top Chrome ChromeOS material-hybrid':
         'gn_chromeos_with_codecs_debug_bot',
       'MD Top Chrome ChromeOS non-material':
         'gn_chromeos_with_codecs_debug_bot',
       'MD Top Chrome Win material':
         'gyp_debug_bot_minimal_symbols_x64',
@@ skipping 686 matching lines @@
       'win_chromium_variable_archive': 'findit',
       'win_chromium_variable_chrome': 'findit',
       'win_chromium_variable_clang': 'findit',
       'win_chromium_variable_gn': 'findit',
       'win_chromium_variable_webkit_builder': 'findit',
       'win_chromium_variable_webkit_layout': 'findit',
       'win_chromium_variable_webkit_win7_builder': 'findit',
       '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_dbg': 'swarming_gn_clang_debug_trybot_x86',
+      'win_clang_rel': 'swarming_gn_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_clang_x64_rel': 'swarming_gn_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_gn_release_trybot_x86',
       'win_pgo': [
         'gyp_official_optimize_chrome_pgo_phase_1_x86',
         'gyp_official_optimize_chrome_pgo_phase_2_x86',
       ],
       'win_upload_clang': 'gn_release_bot',
       'win_chrome_official': 'gn_official_goma_minimal_symbols_x86',
@@ skipping 829 matching lines @@
 
     'swarming_gyp_asan_clang_tot_full_symbols_static_release': [
       'swarming', 'gyp', 'asan', 'clang_tot', 'full_symbols', 'static',
       'release',
     ],
 
     'swarming_gn_chromeos_msan_release_bot': [
       'swarming', 'gn', 'chromeos', 'msan', 'release_bot',
     ],
 
-    'swarming_gyp_clang_debug_bot_minimal_symbols_x86': [
-      'swarming', 'gyp', 'clang', 'debug_bot', 'minimal_symbols', 'x86',
+    'swarming_gn_clang_debug_bot_minimal_symbols_x86': [
+      'swarming', 'gn', 'clang', 'debug_bot', 'minimal_symbols', 'x86',
     ],
 
-    'swarming_gyp_clang_debug_trybot_x86': [
-      'swarming', 'gyp', 'clang', 'debug_trybot', 'x86',
+    'swarming_gn_clang_debug_trybot_x86': [
+      'swarming', 'gn', 'clang', 'debug_trybot', 'x86',
     ],
 
-    'swarming_gyp_clang_minimal_symbols_shared_release_bot_x64': [
-      'swarming', 'gyp', 'clang', 'minimal_symbols', 'shared_release_bot',
+    'swarming_gn_clang_minimal_symbols_shared_release_bot_x64': [
+      'swarming', 'gn', 'clang', 'minimal_symbols', 'shared_release_bot',
       'x64',
     ],
 
-    'swarming_gyp_clang_official_release_bot_minimal_symbols_x64': [
-      'swarming', 'gyp', 'clang', 'official', 'release_bot',
+    'swarming_gn_clang_official_release_bot_minimal_symbols_x64': [
+      'swarming', 'gn', 'clang', 'official', 'release_bot',
       'minimal_symbols', 'x64',
     ],
 
     'swarming_gn_clang_official_release_bot_minimal_symbols_x86': [
       'swarming', 'gn', 'clang', 'official', 'release_bot',
       'minimal_symbols', 'x86',
     ],
 
-    'swarming_gyp_clang_official_release_trybot_x64': [
-      'swarming', 'gyp', 'clang', 'official', 'release_trybot', 'x64',
+    'swarming_gn_clang_official_release_trybot_x64': [
+      'swarming', 'gn', 'clang', 'official', 'release_trybot', 'x64',
     ],
 
-    'swarming_gyp_clang_official_release_trybot_x86': [
-      'swarming', 'gyp', 'clang', 'official', 'release_trybot', 'x86',
+    'swarming_gn_clang_official_release_trybot_x86': [
+      'swarming', 'gn', 'clang', 'official', 'release_trybot', 'x86',
     ],
 
     'swarming_gn_clang_shared_release_bot_minimal_symbols_x86': [
       'swarming', 'gn', 'clang', 'shared_release_bot', 'minimal_symbols',
       'x86',
     ],
 
     'swarming_gn_clang_tot_asan_lsan_static_release': [
       'swarming', 'gn', 'clang_tot', 'asan', 'lsan', 'static', 'release',
     ],
 
     'swarming_gn_clang_tot_edge_ubsan_no_recover_hack_static_release': [
       '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_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',
+    'swarming_gn_clang_tot_minimal_symbols_shared_debug_use_lld_x64': [
+      'swarming', 'gn', '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',
+    'swarming_gn_clang_tot_minimal_symbols_shared_debug_use_lld_x86': [
+      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'use_lld', 'x86',
     ],
 
-    'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x64': [
-      'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
+    'swarming_gn_clang_tot_minimal_symbols_shared_debug_x64': [
+      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'x64',
     ],
 
     'swarming_gn_clang_tot_minimal_symbols_shared_debug_x86': [
       'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'x86',
     ],
 
-    'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x64': [
-      'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
+    'swarming_gn_clang_tot_minimal_symbols_shared_release_use_lld_x64': [
+      'swarming', 'gn', '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',
+    'swarming_gn_clang_tot_minimal_symbols_shared_release_use_lld_x86': [
+      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'use_lld', 'x86',
     ],
 
     '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',
+    'swarming_gn_clang_tot_minimal_symbols_shared_release_x86': [
+      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'x86',
     ],
 
     'swarming_gn_clang_tot_official_minimal_symbols_static_release_x64': [
       'swarming', 'gn', 'clang_tot', 'official', 'minimal_symbols', 'static',
       'release', 'x64',
     ],
 
-    'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x86': [
-      'swarming', 'gyp', 'clang_tot', 'official', 'minimal_symbols', 'static',
+    'swarming_gn_clang_tot_official_minimal_symbols_static_release_x86': [
+      'swarming', 'gn', 'clang_tot', 'official', 'minimal_symbols', 'static',
       'release', 'x86',
     ],
 
     'swarming_gn_release_trybot_arm': [
       'swarming', 'gn', 'release_trybot', 'arm', 'crosscompile',
     ],
 
     'swarming_gyp_syzyasan_release_trybot_x86': [
       'swarming', 'gyp', 'syzyasan', 'release_trybot', 'x86',
     ],
@@ skipping 485 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',
     },
   },
 }