Re-land "Flip 'Linux x64' bot on chromium waterfall 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 the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
@@ skipping 41 matching lines @@
     'gyp_official_goma_minimal_symbols_android_arm64': ['gyp', 'official', 'goma', 'minimal_symbols', 'android', 'arm64'],
     'gyp_official_goma_minimal_symbols_x64': ['gyp', 'official', 'goma', 'minimal_symbols', 'x64'],
     'gyp_official_goma_minimal_symbols_x86': ['gyp', 'official', 'goma', 'minimal_symbols', 'x86'],
     'gyp_release_trybot': ['gyp', 'release_trybot'],
     'gyp_release_trybot_x64': ['gyp', 'release_trybot', 'x64'],
     'libfuzzer_upload_bot': ['gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs'],
 
     # This is just for completeness; any bot that uses this config should never actually run MB.
     'none': ['none'],
 
+    'noswarming_gn_release_bot': ['noswarming', 'gn', 'release_bot'],
     'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'],
-    'noswarming_gyp_release_bot_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'linux_dump_symbols'],
     'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot', 'mac_strip'],
-    'noswarming_gyp_release_bot_x86_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'x86', 'linux_dump_symbols'],
+    'noswarming_gyp_release_bot_x86': ['noswarming', 'gyp', 'release_bot', 'x86'],
 
     'swarming_asan_lsan_gyp_release_trybot': ['swarming', 'asan', 'lsan', 'release_trybot'],
     'swarming_msan_gyp_release_trybot': ['swarming', 'chromeos', 'msan', 'gyp', 'release_trybot'],
     'swarming_deterministic_gyp_release_bot': ['swarming', 'deterministic', 'gyp', 'release_bot'],
     'swarming_gpu_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'gn', 'release_trybot'],
     '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_trybot': ['swarming', 'gn', 'debug_trybot'],
     'swarming_gn_release_bot': ['swarming', 'gn', 'release_bot'],
@@ skipping 154 matching lines @@
 
     'gpu_tests': {
       'gn_args': '', # not needed in GN builds.
       'gyp_defines': 'archive_gpu_tests=1',
     },
 
     'gyp': {'type': 'gyp'},
 
     'libfuzzer': { 'gn_args': 'use_libfuzzer=true' },
 
-    'linux_dump_symbols': {
-      'gn_args': '', # TODO(GYP): Port linux_dump_symbols?
-      'gyp_defines': 'linux_dump_symbols=1',
-    },
-
     'lsan': {
       'gn_args': 'use_lsan=true',
       'gyp_defines': 'lsan=1',
     },
 
     'mac_strip': {
       'gn_args': 'error', # TODO(GYP): Port mac_strip_release
       'gyp_defines': 'mac_strip_release=1',
     },
 
@@ skipping 15 matching lines @@
     # This config is used by bots that aren't building Chromium and should
     # never be running MB. It is used for tracking purposes. These values
     # were picked such that if someone did try to run MB, both GN and GYP
     # should error out.
     'none': {
       'gn_args': 'error',
       'gyp_defines': 'target_arch=unknown',
     },
 
     'noswarming': {
+      # test_isolation_mode doesn't exist in a GN build (it's always a no-op).
       'gn_args': '',
       'gyp_defines': 'test_isolation_mode=noop',
     },
 
     'official': {
       'gn_args': 'is_chrome_branded=true is_official_build=true is_debug=false',
       'gyp_defines': 'branding=Chrome buildtype=Official',
     },
 
     'ozone': {
@@ skipping 63 matching lines @@
   'masters': {
     'chrome': {
       'precise64': 'gn_official',
     },
     'chrome.continuous': {
       'precise64 trunk': 'gn_official',
     },
     'chromium': {
       'Win': 'noswarming_gyp_release_bot',
       'Mac': 'noswarming_gyp_release_bot_mac_strip',
-      'Linux x64': 'noswarming_gyp_release_bot_linux_dump_symbols',
-      'Linux': 'noswarming_gyp_release_bot_x86_linux_dump_symbols',
+      'Linux x64': 'noswarming_gn_release_bot',
+      'Linux': 'noswarming_gyp_release_bot_x86',
       'Android': 'android_gyp_release_bot_minimal_symbols',
     },
     'chromium.android': {
       'Android GN Builder (dbg)': 'android_gn_debug_bot',
       'Android Aura Builder (dbg)': 'android_aura_gn_debug_bot',
     },
     'chromium.chrome': {
       'Google Chrome Win': 'gyp_official_goma_minimal_symbols_x86',
       'Google Chrome Linux': 'gyp_official_goma_x86',
       'Google Chrome Linux x64': 'gn_official_goma',
@@ skipping 121 matching lines @@
       'linux_chromium_trusty32_dbg': 'gyp_debug_bot_x86',
       'linux_chromium_gn_dbg': 'gn_debug_bot',
       'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot',
       'android_chromium_gn_compile_dbg': 'android_gn_debug_bot',
       'linux_chromium_msan_rel_ng': 'swarming_msan_gyp_release_trybot',
       'linux_chromium_tsan_rel_ng': 'swarming_tsan_gyp_release_trybot',
       'linux_chromium_practice_rel_ng': 'gyp_release_trybot',
       'linux_arm_compile': 'swarming_gyp_release_trybot_arm',
       'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
       'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
-      'linux_chromium_archive_rel_ng': 'noswarming_gyp_release_bot_linux_dump_symbols',
+      'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot',
       'linux_chromium_clobber_rel_ng': 'gyp_release_trybot',
       'linux_chromium_gn_upload': 'gn_linux_upload',
       'cast_shell_linux': 'cast_gyp_release_trybot',
       'linux_deterministic': 'swarming_deterministic_gyp_release_bot',
       'linux_ecs_ozone': 'embedded_gyp_debug_bot',
     },
     'tryserver.chromium.mac': {
       'mac_chromium_gn_dbg': 'gn_debug_static_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
@@ skipping 32 matching lines @@
       'win8_chromium_gn_rel': 'gn_release_trybot_x86',
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
     },
     'tryserver.v8': {
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
     },
   },
 }