Re-land "Flip Linux bots on chromium.lkgr 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 296 matching lines @@
       'Cast Linux': 'cast_gn_release_bot',
       'Linux Builder (dbg)': 'swarming_gn_debug_bot',
       'Linux Builder (dbg)(32)': 'swarming_gn_debug_bot_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_debug_bot',
+      'ASAN Debug': 'gn_asan_lsan_edge_debug_bot',
       'ASAN Release (symbolized)':
-        'gyp_asan_lsan_edge_fuzzer_v8_heap_symbolized_release_bot',
+        'gn_asan_lsan_edge_fuzzer_v8_heap_symbolized_release_bot',
       'ASAN Release Media':
-        'gyp_asan_lsan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot',
-      'ASAN Release': 'gyp_asan_lsan_edge_fuzzer_v8_heap_release_bot',
+        'gn_asan_lsan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot',
+      'ASAN Release': 'gn_asan_lsan_edge_fuzzer_v8_heap_release_bot',
       'ASan Debug (32-bit x86 with V8-ARM)':
-        'gyp_asan_edge_v8_heap_debug_bot_hybrid',
+        'gn_asan_edge_v8_heap_debug_bot_hybrid',
       'ASan Release (32-bit x86 with V8-ARM)':
-        'gyp_asan_edge_fuzzer_v8_heap_release_bot_hybrid',
+        'gn_asan_edge_fuzzer_v8_heap_release_bot_hybrid',
       'ASan Release (32-bit x86 with V8-ARM, symbolized)':
-        'gyp_asan_edge_fuzzer_v8_heap_symbolized_release_bot_hybrid',
+        'gn_asan_edge_fuzzer_v8_heap_symbolized_release_bot_hybrid',
       'ASan Release Media (32-bit x86 with V8-ARM)':
-        'gyp_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid',
+        'gn_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid',
       'ChromiumOS ASAN Release':
-        'gyp_chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot',
+        'gn_chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot',
       'MSAN Release (chained origins)': 'gn_msan_edge_release_bot',
       'MSAN Release (no origins)': 'gn_msan_no_origins_edge_release_bot',
       'Mac ASAN Debug': 'gyp_asan_fuzzer_v8_heap_debug_symbols_static_bot',
       'Mac ASAN Release Media':
         'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot',
       'Mac ASAN Release': 'gyp_asan_fuzzer_v8_heap_release_bot',
-      'TSAN Debug': 'gyp_tsan_disable_nacl_line_tables_debug_bot',
-      'TSAN Release': 'gyp_tsan_disable_nacl_line_tables_release_bot',
+      'TSAN Debug': 'gn_tsan_disable_nacl_line_tables_debug_bot',
+      'TSAN Release': 'gn_tsan_disable_nacl_line_tables_release_bot',
       'Telemetry Harness Upload': 'none',
-      'UBSan Release': 'gyp_ubsan_release_bot',
-      'UBSan vptr Release': 'gyp_ubsan_vptr_edge_release_bot',
+      'UBSan Release': 'gn_ubsan_release_bot',
+      'UBSan vptr Release': 'gn_ubsan_vptr_edge_release_bot',
       'Win ASan Release Coverage':
         'gyp_asan_edge_fuzzer_v8_heap_release_bot_x86',
       'Win ASan Release Media':
         'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86',
       'Win ASan Release': 'gyp_asan_fuzzer_v8_heap_release_bot_x86',
       'Win SyzyASAN LKGR': 'gyp_syzyasan_no_pch_win_z7_x86',
     },
 
     'chromium.mac': {
       'Mac Builder': 'swarming_gpu_tests_gyp_release_bot',
@@ skipping 855 matching lines @@
 
     'gn_windows_analyze': [
       'gn', 'no_symbols', 'disable_precompiled_headers',
       'shared', 'x86', 'win_analyze',
     ],
 
     'gn_ubsan_vptr_release_bot': [
       'gn', 'ubsan_vptr', 'ubsan_no_recover_hack', 'release_bot',
     ],
 
-    'gyp_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid': [
-      'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', 'chromeos_codecs',
+    'gn_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid': [
+      'gn', 'asan', 'edge', 'fuzzer', 'v8_heap', 'chromeos_codecs',
       'release_bot', 'hybrid',
     ],
 
-    'gyp_asan_edge_v8_heap_debug_bot_hybrid': [
-      'gyp', 'asan', 'edge', 'v8_heap', 'debug_bot', 'hybrid',
+    'gn_asan_edge_v8_heap_debug_bot_hybrid': [
+      'gn', 'asan', 'edge', 'v8_heap', 'debug_bot', 'hybrid',
     ],
 
-    'gyp_asan_edge_fuzzer_v8_heap_release_bot_hybrid': [
-      'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'hybrid',
+    'gn_asan_edge_fuzzer_v8_heap_release_bot_hybrid': [
+      'gn', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'hybrid',
     ],
 
     'gyp_asan_edge_fuzzer_v8_heap_release_bot_x86': [
       'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'x86',
     ],
 
-    'gyp_asan_edge_fuzzer_v8_heap_symbolized_release_bot_hybrid': [
-      'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', 'symbolized',
+    'gn_asan_edge_fuzzer_v8_heap_symbolized_release_bot_hybrid': [
+      'gn', 'asan', 'edge', 'fuzzer', 'v8_heap', 'symbolized',
       'release_bot', 'hybrid',
     ],
 
     'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs', 'release_bot',
     ],
 
     'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs',
       'release_bot', 'x86',
     ],
 
     'gyp_asan_fuzzer_v8_heap_debug_symbols_static_bot': [
       'gyp', 'asan', 'fuzzer', 'v8_heap',  'debug_symbols_static_bot',
     ],
 
     'gyp_asan_fuzzer_v8_heap_release_bot': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'release_bot',
     ],
 
     'gyp_asan_fuzzer_v8_heap_release_bot_x86': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'release_bot', 'x86',
     ],
 
-    'gyp_asan_lsan_edge_debug_bot': [
-      'gyp', 'asan', 'lsan', 'edge', 'debug_bot',
+    'gn_asan_lsan_edge_debug_bot': [
+      'gn', 'asan', 'lsan', 'edge', 'debug_bot',
     ],
 
-    'gyp_asan_lsan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot': [
-      'gyp', 'asan', 'lsan', 'edge', 'v8_heap', 'chromeos_codecs',
+    'gn_asan_lsan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot': [
+      'gn', 'asan', 'lsan', 'edge', 'v8_heap', 'chromeos_codecs',
       'release_bot',
     ],
 
-    'gyp_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
-      'gyp', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
+    'gn_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
+      'gn', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
     ],
 
-    'gyp_asan_lsan_edge_fuzzer_v8_heap_symbolized_release_bot': [
-      'gyp', 'asan', 'lsan', 'edge', 'v8_heap', 'symbolized', 'release_bot',
+    'gn_asan_lsan_edge_fuzzer_v8_heap_symbolized_release_bot': [
+      'gn', 'asan', 'lsan', 'edge', 'v8_heap', 'symbolized', 'release_bot',
     ],
 
-    'gyp_chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
-      'gyp', 'chromeos', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap',
+    'gn_chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
+      'gn', 'chromeos', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap',
       'release_bot',
     ],
 
     'gyp_chromeos_with_codecs_debug_bot': [
       'gyp', 'chromeos_with_codecs', 'debug_bot',
     ],
 
     'gyp_clang_minimal_symbols_shared_release_bot_x86': [
       'gyp', 'clang', 'minimal_symbols', 'shared_release_bot', 'x86',
     ],
@@ skipping 77 matching lines @@
     ],
 
     'gyp_shared_release_bot_minimal_symbols_x86': [
       'gyp', 'shared_release_bot', 'minimal_symbols', 'x86',
     ],
 
     'gyp_syzyasan_no_pch_win_z7_x86': [
       'gyp', 'syzyasan', 'no_pch', 'win_z7', 'x86',
     ],
 
-    'gyp_tsan_disable_nacl_line_tables_debug_bot': [
-      'gyp', 'tsan', 'disable_nacl', 'line_tables', 'debug_bot',
+    'gn_tsan_disable_nacl_line_tables_debug_bot': [
+      'gn', 'tsan', 'disable_nacl', 'line_tables', 'debug_bot',
     ],
 
-    'gyp_tsan_disable_nacl_line_tables_release_bot': [
-      'gyp', 'tsan', 'disable_nacl', 'line_tables', 'release_bot',
+    'gn_tsan_disable_nacl_line_tables_release_bot': [
+      'gn', 'tsan', 'disable_nacl', 'line_tables', 'release_bot',
     ],
 
-    'gyp_ubsan_release_bot': [
-      'gyp', 'ubsan', 'release_bot',
+    'gn_ubsan_release_bot': [
+      'gn', 'ubsan', 'release_bot',
     ],
 
-    'gyp_ubsan_vptr_edge_release_bot': [
-      'gyp', 'ubsan_vptr', 'edge', 'release_bot',
+    'gn_ubsan_vptr_edge_release_bot': [
+      'gn', 'ubsan_vptr', 'edge', 'release_bot',
     ],
 
     # The 'ios' configs are just used for auditing. iOS bots
     # actually use the ios recipes, not the chromium recipe, and look
     # up their GYP or GN arguments via files checked in under //ios/build/bots.
     # It is an error to actually use one of these configs to generate the
     # build files.
     'ios_gn': [ 'gn', 'error'],
 
     'ios_gyp': ['gyp', 'error'],
@@ skipping 910 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',
     },
   },
 }