Revert of Move about half of the clang/win bots to gn.

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 88faf608fbdc7cd7eb8e3f64961ff0042e5662d1..87f1f2108677a5f307b2cba22369a3a654c5cbbe 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -114,7 +114,7 @@
       'CrWin7Goma(dbg)': 'gyp_debug_bot_minimal_symbols_x86',
       'CrWin7Goma(dll)': 'gyp_shared_release_bot_minimal_symbols_x86',
       'CrWinClang':
-        'swarming_gn_clang_official_release_bot_minimal_symbols_x86',
+        'swarming_gyp_clang_official_release_bot_minimal_symbols_x86',
       'CrWinClang(dbg)':
         'swarming_gyp_clang_debug_bot_minimal_symbols_x86',
       'CrWinClang(dbg) tester': 'none',
@@ -148,19 +148,19 @@
         'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x86',
       'ClangToTWin tester': 'none',
       'ClangToTWin(dbg)':
-        'swarming_gn_clang_tot_minimal_symbols_shared_debug_x86',
+        'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x86',
       'ClangToTWin(dbg) tester': 'none',
       'ClangToTWin(dll)':
         'swarming_gyp_clang_tot_minimal_symbols_shared_release_x86',
       'ClangToTWin(dll) tester': 'none',
       'ClangToTWin64':
-        'swarming_gn_clang_tot_official_minimal_symbols_static_release_x64',
+        'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x64',
       'ClangToTWin64 tester': 'none',
       'ClangToTWin64(dbg)':
         'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x64',
       'ClangToTWin64(dbg) tester': 'none',
       'ClangToTWin64(dll)':
-        'swarming_gn_clang_tot_minimal_symbols_shared_release_x64',
+        'swarming_gyp_clang_tot_minimal_symbols_shared_release_x64',
       'ClangToTWin64(dll) tester': 'none',
       'ClangToTiOS': 'ios_gyp',
       'Closure Compilation Linux': 'closure_compilation',
@@ -175,7 +175,7 @@
           '_static_v8_heap_x86_full_symbols_release'),
       'CrWinAsanCov tester': 'none',
       'CrWinClang(shared)':
-        'swarming_gn_clang_shared_release_bot_minimal_symbols_x86',
+        'swarming_gyp_clang_shared_release_bot_minimal_symbols_x86',
       'CrWinClang(shared) tester': 'none',
       'CrWinClang64 tester': 'none',
       'CrWinClang64(dbg)': 'win_clang_debug_bot',
@@ -1678,8 +1678,8 @@
       'minimal_symbols', 'x64',
     ],
 
-    'swarming_gn_clang_official_release_bot_minimal_symbols_x86': [
-      'swarming', 'gn', 'clang', 'official', 'release_bot',
+    'swarming_gyp_clang_official_release_bot_minimal_symbols_x86': [
+      'swarming', 'gyp', 'clang', 'official', 'release_bot',
       'minimal_symbols', 'x86',
     ],
 
@@ -1691,8 +1691,8 @@
       'swarming', 'gyp', 'clang', 'official', 'release_trybot', 'x86',
     ],
 
-    'swarming_gn_clang_shared_release_bot_minimal_symbols_x86': [
-      'swarming', 'gn', 'clang', 'shared_release_bot', 'minimal_symbols',
+    'swarming_gyp_clang_shared_release_bot_minimal_symbols_x86': [
+      'swarming', 'gyp', 'clang', 'shared_release_bot', 'minimal_symbols',
       'x86',
     ],
 
@@ -1731,8 +1731,8 @@
       'x64',
     ],
 
-    'swarming_gn_clang_tot_minimal_symbols_shared_debug_x86': [
-      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
+    'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x86': [
+      'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'x86',
     ],
 
@@ -1750,8 +1750,8 @@
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
     ],
 
-    'swarming_gn_clang_tot_minimal_symbols_shared_release_x64': [
-      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'release',
+    'swarming_gyp_clang_tot_minimal_symbols_shared_release_x64': [
+      'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'x64',
     ],
 
@@ -1760,8 +1760,8 @@
       'x86',
     ],
 
-    'swarming_gn_clang_tot_official_minimal_symbols_static_release_x64': [
-      'swarming', 'gn', 'clang_tot', 'official', 'minimal_symbols', 'static',
+    'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x64': [
+      'swarming', 'gyp', 'clang_tot', 'official', 'minimal_symbols', 'static',
       'release', 'x64',
     ],