Revert of Flip all remaining Linux x86 (32-bit) bots 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 98 matching lines @@
       'Android Asan Builder Tests (dbg)':
           'android_asan_gn_clang_debug_bot_minimal_symbols',
       'Android Builder (dbg)': 'android_gn_debug_static_bot',
       'Browser Side Navigation Linux': 'gyp_release_bot',
       'CFI Linux CF': 'gn_cfi_diag_release_bot',
       'CFI Linux ToT': 'gn_cfi_release_bot',
       'CFI Linux': 'gn_cfi_release_bot',
       'Chromium Linux Goma Canary': 'gn_release_bot',
       'Chromium Linux Goma Canary (clobber)': 'gn_release_bot',
       'Chromium Linux Precise Goma LinkTest': 'gn_release_bot',
-      'Chromium Linux32 Goma Canary (clobber)': 'gn_release_bot_x86',
+      'Chromium Linux32 Goma Canary (clobber)': 'gyp_release_bot_x86',
       'Chromium Mac 10.10 MacViews': 'mac_views_browser_gyp_release_bot',
       'Chromium Mac 10.11': 'gyp_release_bot',
       'Chromium Mac 10.11 Force Mac Toolchain': 'gyp_release_bot',
       'Chromium Mac 10.9 Goma Canary': 'gyp_release_bot',
       'Chromium Mac 10.9 Goma Canary (clobber)': 'gyp_release_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)': 'gyp_debug_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'gyp_debug_bot',
       'Chromium Win PGO Builder': 'gyp_official_winpgo',
       'Chromium Win x64 PGO Builder': 'gyp_official_winpgo_x64',
       'Chromium Windows Analyze': 'gn_windows_analyze',
@@ skipping 153 matching lines @@
       'Android Builder': 'swarming_android_gyp_release_bot_minimal_symbols',
       'Android Clang Builder (dbg)':
         'android_clang_asan_findbugs_gyp_debug_bot_minimal_symbols',
       'Android GN (dbg)': 'android_gn_debug_bot_minimal_symbols',
       'Android GN': 'android_gn_release_bot_minimal_symbols',
       'Android Tests (dbg)': 'swarming_android_gyp_debug_static_bot',
       'Android Tests': 'swarming_android_gyp_release_bot_minimal_symbols',
       'Cast Android (dbg)': 'android_cast_gn_debug_static_bot',
       'Cast Linux': 'cast_gn_release_bot',
       'Linux Builder (dbg)': 'swarming_gn_debug_bot',
-      'Linux Builder (dbg)(32)': 'swarming_gn_debug_bot_no_symbols_x86',
+      'Linux Builder (dbg)(32)': 'swarming_gyp_debug_bot_no_symbols_x86',
       'Linux Builder': 'swarming_gn_release_bot',
       'Linux Tests (dbg)(1)': 'none',
       'Linux Tests (dbg)(1)(32)': 'none',
       'Linux Tests': 'none',
     },
 
     'chromium.lkgr': {
       'ASAN Debug': 'gyp_asan_lsan_edge_fuzzer_debug_bot',
       'ASAN Release (symbolized)':
         'gyp_asan_lsan_edge_fuzzer_v8_heap_symbolized_release_bot',
@@ skipping 398 matching lines @@
       'linux_chromium_chromeos_dbg_ng':
         'swarming_chromeos_gyp_debug_trybot',
       'linux_chromium_chromeos_msan_rel_ng':
         'swarming_msan_gyp_release_trybot',
       'linux_chromium_chromeos_ozone_rel_ng':
         'swarming_chromeos_gyp_ozone_release_trybot',
       'linux_chromium_chromeos_rel_ng': 'swarming_chromeos_gyp_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_32_ng': 'swarming_gyp_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_32_ng': 'swarming_gyp_debug_trybot_x86',
       'linux_chromium_dbg_ng': 'swarming_gn_debug_trybot',
       'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot',
       'linux_chromium_gn_chromeos_rel': 'chromeos_ozone_gn_release_trybot',
       'linux_chromium_gn_chromeos_variable': 'findit',
       'linux_chromium_gn_upload': 'gn_linux_upload',
       'linux_chromium_msan_rel_ng': 'swarming_msan_gyp_release_trybot',
       'linux_chromium_practice_rel_ng': 'gyp_release_trybot',
       'linux_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'linux_chromium_tsan_rel_ng': 'swarming_tsan_gyp_release_trybot',
       'linux_chromium_tsan_rel_ng':
@@ skipping 385 matching lines @@
     ],
 
     'gn_official_goma_minimal_symbols_android_arm64': [
       'gn', 'official', 'goma', 'minimal_symbols', 'android', 'arm64',
     ],
 
     'gn_release_bot': [
       'gn', 'release_bot',
     ],
 
-    'gn_release_bot_x86': [
-      'gn', 'release_bot', 'x86',
-    ],
-
     'gn_release_bot_minimal_symbols': [
       'gn', 'release_bot_minimal_symbols',
     ],
 
     'gn_release_bot_minimal_symbols_x86': [
       'gn', 'release_bot_minimal_symbols', 'x86',
     ],
 
     'gn_release_trybot': [
       'gn', 'release_trybot',
@@ skipping 171 matching lines @@
     ],
 
     'gyp_release_bot': [
       'gyp', 'release_bot',
     ],
 
     'gyp_release_bot_android': [
       'gyp', 'release_bot', 'android',
     ],
 
+    'gyp_release_bot_x86': [
+      'gyp', 'release_bot', 'x86',
+    ],
+
     'gyp_release_trybot': [
       'gyp', 'release_trybot',
     ],
 
     'gyp_release_trybot_x64': [
       'gyp', 'release_trybot', 'x64',
     ],
 
     'gn_release_libfuzzer_asan': [
       'gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs', 'pdf_xfa',
@@ skipping 332 matching lines @@
 
     'swarming_gpu_tests_gyp_release_trybot_minimal_symbols_x86': [
       'swarming', 'gpu_tests', 'gyp', 'release_trybot', 'minimal_symbols',
       'x86',
     ],
 
     'swarming_gn_debug_bot': [
       'swarming', 'gn', 'debug_bot',
     ],
 
-    'swarming_gn_debug_bot_no_symbols_x86': [
-      'swarming', 'gn', 'debug_bot', 'no_symbols', 'x86',
-    ],
-
-    'swarming_gn_debug_trybot_x86': [
-      'swarming', 'gn', 'debug_trybot', 'x86',
-    ],
-
     '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',
@@ skipping 57 matching lines @@
     ],
 
     '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',
     ],
 
+    'swarming_gyp_debug_bot_no_symbols_x86': [
+      'swarming', 'gyp', 'debug_bot', 'no_symbols', 'x86',
+    ],
+
+    'swarming_gyp_debug_trybot_x86': [
+      'swarming', 'gyp', 'debug_trybot', 'x86',
+    ],
+
     'swarming_gyp_msan_release_bot': [
       'swarming', 'gyp', 'msan', 'release_bot',
     ],
 
     'swarming_gyp_release_bot': [
       'swarming', 'gyp', 'release_bot',
     ],
 
     'swarming_gyp_release_bot_arm': [
       'swarming', 'gyp', 'release_bot', 'arm', 'crosscompile',
@@ skipping 503 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',
     },
   },
 }