Revert of Flip linux blink 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 ca88a5c39511e7a133ba842cb9a9dd23e987cebc..8243733e38f538356a3902338a2115148095952c 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -81,17 +81,9 @@
     'swarming_gpu_tests_gyp_debug_trybot': ['swarming', 'gpu_tests', 'gyp', 'debug_trybot'],
     'swarming_gpu_tests_gyp_release_trybot': ['swarming', 'gpu_tests', 'gyp', 'release_trybot'],
     'swarming_gn_debug_bot': ['swarming', 'gn', 'debug_bot'],
-    'swarming_gn_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'debug_bot_minimal_symbols', 'x64'],
-    'swarming_gn_debug_bot_x64': ['swarming', 'gn', 'debug_bot', 'x64'],
     'swarming_gn_debug_trybot': ['swarming', 'gn', 'debug_trybot'],
-    'swarming_gn_oilpan_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'oilpan', 'debug_bot', 'minimal_symbols', 'x64'],
-    'swarming_gn_oilpan_debug_bot_x64': ['swarming', 'gn', 'oilpan', 'debug_bot', 'minimal_symbols', 'x64'],
-    'swarming_gn_oilpan_release_bot_x64': ['swarming', 'gn', 'oilpan', 'release_bot', 'x64'],
-    'swarming_gn_oilpan_release_trybot_minimal_symbols_x64': ['swarming', 'gn', 'oilpan', 'release_trybot', 'minimal_symbols', 'x64'],
     'swarming_gn_release_bot': ['swarming', 'gn', 'release_bot'],
-    'swarming_gn_release_bot_x64': ['swarming', 'gn', 'release_bot', 'x64'],
     'swarming_gn_release_trybot': ['swarming', 'gn', 'release_bot'],
-    'swarming_gn_release_trybot_minimal_symbols_x64': ['swarming', 'gn', 'release_trybot', 'minimal_symbols', 'x64'],
     'swarming_gyp_asan_lsan_release_bot_x64': ['swarming', 'gyp', 'asan', 'lsan', 'release_bot', 'x64'],
     'swarming_gyp_debug_bot_minimal_symbols_x64': ['swarming', 'gyp', 'debug_bot_minimal_symbols', 'x64'],
     'swarming_gyp_debug_bot_minimal_symbols_x86': ['swarming', 'gyp', 'debug_bot_minimal_symbols', 'x86'],
@@ -499,17 +491,17 @@
       'WebKit Mac Builder (dbg)': 'swarming_gyp_debug_bot_x64',
       'WebKit Mac10.7 (dbg)': 'none',
       'WebKit Mac Oilpan (dbg)': 'swarming_gyp_oilpan_debug_bot_x64',
-      'WebKit Linux': 'swarming_gn_release_bot_x64',
-      'WebKit Linux Trusty': 'swarming_gn_release_bot_x64',
+      'WebKit Linux': 'swarming_gyp_release_bot_x64',
+      'WebKit Linux Trusty': 'swarming_gyp_release_bot_x64',
       'WebKit Linux 32': 'swarming_gyp_release_bot_x86',
-      'WebKit Linux Oilpan': 'swarming_gn_oilpan_release_bot_x64',
+      'WebKit Linux Oilpan': 'swarming_gyp_oilpan_release_bot_x64',
       'WebKit Linux ASAN': 'swarming_gyp_asan_lsan_release_bot_x64',
       'WebKit Linux Oilpan ASAN': 'swarming_gyp_oilpan_asan_lsan_release_bot_x64',
       'WebKit Linux MSAN': 'swarming_gyp_msan_release_bot_x64',
-      'WebKit Linux Leak': 'swarming_gn_release_bot_x64',
-      'WebKit Linux Oilpan Leak': 'swarming_gn_oilpan_release_bot_x64',
-      'WebKit Linux (dbg)': 'swarming_gn_debug_bot_x64',
-      'WebKit Linux Oilpan (dbg)': 'swarming_gn_oilpan_debug_bot_x64',
+      'WebKit Linux Leak': 'swarming_gyp_release_bot_x64',
+      'WebKit Linux Oilpan Leak': 'swarming_gyp_oilpan_release_bot_x64',
+      'WebKit Linux (dbg)': 'swarming_gyp_debug_bot_x64',
+      'WebKit Linux Oilpan (dbg)': 'swarming_gyp_oilpan_debug_bot_x64',
       'Android Builder': 'gyp_release_bot_android',
       'WebKit Android (Nexus4)': 'gyp_release_bot_android',
     },
@@ -548,10 +540,10 @@
       'precise64 trunk': 'gn_official',
     },
     'tryserver.blink': {
-      'linux_blink_dbg': 'swarming_gn_debug_bot_minimal_symbols_x64',
-      'linux_blink_compile_dbg': 'swarming_gn_debug_bot_minimal_symbols_x64',
-      'linux_blink_compile_rel': 'swarming_gn_release_trybot_minimal_symbols_x64',
-      'linux_blink_rel': 'swarming_gn_release_trybot_minimal_symbols_x64',
+      'linux_blink_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x64',
+      'linux_blink_compile_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x64',
+      'linux_blink_compile_rel': 'swarming_gyp_release_trybot_minimal_symbols_x64',
+      'linux_blink_rel': 'swarming_gyp_release_trybot_minimal_symbols_x64',
       'mac_blink_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x64',
       'mac_blink_compile_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x64',
       'mac_blink_compile_rel': 'swarming_gyp_release_bot_minimal_symbols_x64',
@@ -560,16 +552,16 @@
       'win_blink_compile_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x86',
       'win_blink_compile_rel': 'swarming_gyp_release_trybot_minimal_symbols_x86',
       'win_blink_rel': 'swarming_gyp_release_trybot_minimal_symbols_x86',
-      'linux_blink_oilpan_dbg': 'swarming_gn_oilpan_debug_bot_minimal_symbols_x64',
-      'linux_blink_oilpan_rel': 'swarming_gn_oilpan_release_trybot_minimal_symbols_x64',
-      'linux_blink_oilpan_compile_rel': 'swarming_gn_oilpan_release_trybot_minimal_symbols_x64',
+      'linux_blink_oilpan_dbg': 'swarming_gyp_oilpan_debug_bot_minimal_symbols_x64',
+      'linux_blink_oilpan_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x64',
+      'linux_blink_oilpan_compile_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x64',
       'mac_blink_oilpan_dbg': 'swarming_gyp_oilpan_debug_bot_minimal_symbols_x64',
       'mac_blink_oilpan_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x64',
       'mac_blink_oilpan_compile_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x64',
       'win_blink_oilpan_dbg': 'swarming_gyp_oilpan_debug_bot_minimal_symbols_x86',
       'win_blink_oilpan_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x86',
       'win_blink_oilpan_compile_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x86',
-      'linux_blink_rel_ng': 'swarming_gn_release_trybot_minimal_symbols_x64',
+      'linux_blink_rel_ng': 'swarming_gyp_release_trybot_minimal_symbols_x64',
       'blink_presubmit': 'none',
     },
     'tryserver.chromium.android': {