Update MB config with missing builder entries, etc.

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 19 matching lines @@
           'android_cronet_gn_release_bot_minimal_symbols',
       'Android Cronet Builder (dbg)': 'android_cronet_gn_debug_static_bot',
       'Android Cronet Data Reduction Proxy Builder':
           'android_cronet_data_reduction_proxy_gn_release_bot_minimal_symbols',
       'Android Cronet MIPS Builder':
           'android_cronet_gn_release_bot_minimal_symbols_mipsel',
       'Android Cronet x86 Builder':
           'android_cronet_gn_release_bot_minimal_symbols_x86',
       'Android Cronet x86 Builder (dbg)':
           'android_cronet_gn_debug_static_bot_x86',
-      'Android GN Builder (dbg)': 'android_gn_debug_bot_minimal_symbols',
       'Android MIPS Builder (dbg)':
           'android_gn_debug_static_minimal_symbols_mipsel',
       'Android N5X Swarm Builder':
           'swarming_android_gn_release_bot_minimal_symbols_arm64',
       'Android Swarm Builder':
           'swarming_android_gn_release_bot_minimal_symbols',
       'Android WebView CTS L-MR1 (dbg)': 'none',
       'Android Webview L (dbg)': 'none',
       'Android Webview M (dbg)': 'none',
       'Android arm Builder (dbg)': 'android_gn_debug_static_bot',
@@ skipping 32 matching lines @@
       'Linux ChromiumOS Tests (1)': 'none',
       'Linux ChromiumOS Tests (dbg)(1)': 'none',
     },
 
     'chromium.fyi': {
       'Android ChromeDriver Tests (dbg)': 'none',
       'Android Cloud Tests': 'android_gn_debug_static_bot_x86',
       'Android Remoting Tests': 'none',
       'Android Tests (trial)(dbg)': 'none',
       'Android Tests (x86 emulator)': 'android_gn_debug_static_bot_x86',
-      'Android Asan Builder Tests (dbg)':
-          'android_asan_gn_clang_shared_debug_minimal_symbols',
       'Android Builder (dbg)': 'android_gn_debug_static_bot',
       'Blimp Linux (dbg)':
         '//build/args/bots/chromium.fyi/blimp_linux_dbg.gn',
       'Browser Side Navigation Linux': 'gn_release_bot',
       'CFI Linux CF': 'gn_cfi_diag_release_static',
       'CFI Linux ToT': 'gn_cfi_release_static',
       'CFI Linux': 'gn_cfi_release_static',
       'Chromium Linux Goma Canary': 'gn_release_bot',
       'Chromium Linux Goma Canary (clobber)': 'gn_release_bot',
       'Chromium Linux Precise Goma LinkTest': 'gn_release_bot',
@@ skipping 87 matching lines @@
       'CrWinClangLLD tester': 'none',
       'CrWinClangLLD64':
         'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x64',
       'CrWinClangLLD64 tester': 'none',
       'CrWinClngLLD64dbg':
         'swarming_gyp_clang_tot_minimal_symbols_shared_debug_use_lld_x64',
       'CrWinClngLLD64dbg tester': 'none',
       'CrWinClngLLDdbg':
         'swarming_gyp_clang_tot_minimal_symbols_shared_debug_use_lld_x86',
       'CrWinClngLLDdbg tester': 'none',
+      'EarlGreyiOS': 'ios_gyp',
       'Headless Linux (dbg)':
         '//build/args/bots/chromium.fyi/headless_linux_dbg.gn',
       'MD Top Chrome ChromeOS material-hybrid':
         'gyp_chromeos_with_codecs_debug_bot',
       'MD Top Chrome ChromeOS non-material':
         'gyp_chromeos_with_codecs_debug_bot',
       'MD Top Chrome Win material':
         'gyp_debug_bot_minimal_symbols_x64',
       'MD Top Chrome Linux material': 'gn_debug_bot',
       'LTO Linux': 'gn_official_goma_lto',
@@ skipping 84 matching lines @@
       'Win8 Release (NVIDIA)': 'none',
     },
 
     'chromium.linux': {
       'Android Arm64 Builder (dbg)':
         'swarming_android_gn_debug_static_bot_arm64',
       'Android Builder (dbg)': 'swarming_android_gn_debug_static_bot',
       'Android Builder': 'swarming_android_gn_release_bot_minimal_symbols',
       'Android Clang Builder (dbg)':
         'android_clang_asan_findbugs_gn_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_gn_debug_static_bot',
       'Android Tests': 'swarming_android_gn_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_x86',
       'Linux Builder': 'swarming_gn_release_bot',
       'Linux Tests (dbg)(1)': 'none',
       'Linux Tests (dbg)(1)(32)': 'none',
       'Linux Tests': 'none',
@@ skipping 44 matching lines @@
       'Mac10.11 Tests': 'none',
       'Mac10.9 Tests (dbg)': 'none',
       'Mac10.9 Tests': 'none',
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
     },
 
     'chromium.memory': {
-      'Linux ASAN LSAN Builder': 'swarming_asan_lsan_gn_release_bot',
-      'Linux ASAN LSAN Tests (1)': 'none',
-      'Linux ASAN LSAN Tests (sandboxed)': 'none',
-      'Mac ASAN 64 Builder': 'swarming_asan_lsan_full_symbols_gyp_release_bot',
-      'Mac ASAN 64 Tests (1)': 'none',
-      'Linux Chromium OS ASAN LSAN Builder':
+      'Linux ASan LSan Builder': 'swarming_asan_lsan_gn_release_bot',
+      'Linux ASan LSan Tests (1)': 'none',
+      'Linux ASan LSan Tests (sandboxed)': 'none',
+      'Mac ASan 64 Builder': 'swarming_asan_lsan_full_symbols_gyp_release_bot',
+      'Mac ASan 64 Tests (1)': 'none',
+      'Linux Chromium OS ASan LSan Builder':
         'swarming_asan_lsan_chromeos_gyp_release_bot',
-      'Linux Chromium OS ASAN LSAN Tests (1)': 'none',
+      'Linux Chromium OS ASan LSan Tests (1)': 'none',
     },
 
     'chromium.memory.fyi': {
       'Chromium Linux ChromeOS MSan Builder':
         'swarming_gyp_chromeos_msan_release_bot',
       'Chromium Linux MSan Builder':
         'swarming_gyp_msan_release_bot',
       'Chromium Linux TSan Builder':
         'swarming_tsan_disable_nacl_gn_release_bot',
       'Chromium Windows Builder (DrMemory x64)':
@@ skipping 40 matching lines @@
       'Android Builder': 'gn_official_goma_minimal_symbols_android',
       'Android Galaxy S5 Perf (1)': 'none',
       'Android Galaxy S5 Perf (2)': 'none',
       'Android Galaxy S5 Perf (3)': 'none',
       'Android Nexus5 Perf (1)': 'none',
       'Android Nexus5 Perf (2)': 'none',
       'Android Nexus5 Perf (3)': 'none',
       'Android Nexus5X Perf (1)': 'none',
       'Android Nexus5X Perf (2)': 'none',
       'Android Nexus5X Perf (3)': 'none',
+      'Android Nexus5X WebView Perf (1)': 'none',
+      'Android Nexus5X WebView Perf (2)': 'none',
+      'Android Nexus5X WebView Perf (3)': 'none',
       'Android Nexus6 Perf (1)': 'none',
       'Android Nexus6 Perf (2)': 'none',
       'Android Nexus6 Perf (3)': 'none',
       'Android Nexus7v2 Perf (1)': 'none',
       'Android Nexus7v2 Perf (2)': 'none',
       'Android Nexus7v2 Perf (3)': 'none',
       'Android Nexus9 Perf (1)': 'none',
       'Android Nexus9 Perf (2)': 'none',
       'Android Nexus9 Perf (3)': 'none',
       'Android One Perf (1)': 'none',
@@ skipping 213 matching lines @@
       'win_blink_compile_dbg': 'swarming_gn_debug_trybot_x86',
       'win_blink_compile_rel': 'swarming_gn_release_bot_minimal_symbols_x86',
       'win_blink_dbg': 'swarming_gn_debug_trybot_x86',
       'win_blink_rel': 'swarming_gn_release_bot_minimal_symbols_x86',
     },
 
     'tryserver.chromium.android': {
       'android_archive_rel_ng': 'android_gn_release_trybot',
       'android_arm64_dbg_recipe': 'swarming_android_gn_debug_trybot_arm64',
       'android_blink_rel': 'swarming_android_gn_release_trybot',
-      'android_chromium_gn_compile_dbg': 'android_gn_debug_trybot',
-      'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
-      'android_chromium_gn_rel': 'android_gn_release_trybot',
       'android_chromium_variable': 'findit',
       'android_chromium_variable_archive': 'findit',
       'android_chromium_variable_arm64': 'findit',
       'android_chromium_variable_cast_shell': 'findit',
       'android_chromium_variable_clang': 'findit',
       'android_chromium_variable_gn': 'findit',
       'android_chromium_variable_nexus4': 'findit',
       'android_clang_dbg_recipe': 'android_clang_asan_findbugs_gn_debug_trybot',
       'android_compile_dbg': 'swarming_android_gn_debug_trybot',
       'android_compile_mips_dbg': 'android_gn_debug_trybot_mipsel',
@@ skipping 78 matching lines @@
       'linux_chromium_variable': 'findit',
       'linux_chromium_variable_32': 'findit',
       'linux_chromium_variable_chrome': 'findit',
       'linux_chromium_variable_clobber': 'findit',
       'linux_chromium_variable_32_chrome': 'findit',
       'linux_chromium_variable_32_clobber': 'findit',
       'linux_chromium_webkit_asan_variable': 'findit',
       'linux_chromium_webkit_leak_variable': 'findit',
       'linux_chromium_webkit_msan_variable': 'findit',
       'linux_chromium_webkit_variable': 'findit',
+      'linux_chromiumos_full_variable': 'findit',
       'linux_nacl_sdk': 'gn_release_bot',
       'linux_nacl_sdk_build': 'gn_release_bot',
       'linux_optional_gpu_tests_rel':
         'swarming_gpu_fyi_tests_gn_release_trybot',
       'linux_site_isolation': 'gn_release_trybot',
       'linux_upload_clang': 'gn_release_bot',
     },
 
     'tryserver.chromium.mac': {
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
       'mac_chromium_10.10_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
+      'mac_chromium_10.10_macviews': 'mac_views_browser_gyp_release_trybot',
       'mac_chromium_archive_rel_ng': 'noswarming_gyp_release_trybot',
       'mac_chromium_asan_rel_ng': 'swarming_asan_dcheck_gyp_release_bot',
       'mac_chromium_asan_variable': 'findit',
       'mac_chromium_compile_dbg_ng': 'swarming_gyp_debug_trybot',
       'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
       'mac_chromium_dbg_ng': 'swarming_gyp_debug_trybot',
       'mac_chromium_gn_dbg': 'gn_debug_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
       'mac_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
       'mac_chromium_variable': 'findit',
       'mac_chromium_variable_10.10': 'findit',
+      'mac_chromium_variable_10.10_macviews': 'findit',
       'mac_chromium_variable_10.10_layout': 'findit',
+      'mac_chromium_variable_10.11': 'findit',
+      'mac_chromium_variable_10.11_layout': 'findit',
       'mac_chromium_variable_archive': 'findit',
       'mac_chromium_variable_chrome': 'findit',
       'mac_chromium_variable_gn': 'findit',
       'mac_chromium_variable_layout': 'findit',
       'mac_nacl_sdk': 'nacl_annotator',
       'mac_nacl_sdk_build': 'nacl_annotator',
       'mac_optional_gpu_tests_rel':
         'swarming_gpu_fyi_tests_gyp_release_trybot',
       'mac_upload_clang': 'gn_release_bot',
     },
@@ skipping 51 matching lines @@
       'win_archive': 'noswarming_gn_release_trybot_x86',
       'win_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot_x86',
       'win_chromium_compile_rel_ng':
         'swarming_gpu_tests_gn_release_trybot_x86',
       'win_chromium_dbg_ng': 'swarming_gn_debug_trybot_x86',
       'win_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot_x86',
       'win_chromium_syzyasan_rel': 'swarming_gyp_syzyasan_release_trybot_x86',
       'win_chromium_variable': 'findit',
       'win_chromium_variable_archive': 'findit',
       'win_chromium_variable_chrome': 'findit',
+      'win_chromium_variable_clang': 'findit',
       'win_chromium_variable_gn': 'findit',
       'win_chromium_variable_webkit_builder': 'findit',
       'win_chromium_variable_webkit_layout': 'findit',
       'win_chromium_variable_webkit_win7_builder': 'findit',
       'win_chromium_variable_webkit_win7_builder_x64': 'findit',
       'win_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
       'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'swarming_gyp_clang_debug_trybot_x86',
       'win_clang_rel': 'swarming_gyp_clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
       'win_clang_x64_rel': 'swarming_gyp_clang_official_release_trybot_x64',
       'win_nacl_sdk': 'nacl_annotator',
       'win_nacl_sdk_build': 'nacl_annotator',
       'win_optional_gpu_tests_rel':
         'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'win_pgo': 'gyp_official_winpgo',
       'win_upload_clang': 'gn_release_bot',
       'win_chrome_official': 'gn_official_goma_minimal_symbols_x86',
+      'win_x64_chromium_variable_builder': 'findit',
     },
 
     'tryserver.v8': {
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
       'v8_linux_blink_rel': 'swarming_gn_release_trybot_x64',
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
     },
   },
 
 
   # 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).
   'configs': {
-    'android_asan_gn_clang_shared_debug_minimal_symbols': [
-      'android', 'asan', 'gn', 'clang', 'shared', 'debug', 'minimal_symbols',
-    ],
-
     'android_cast_gn_debug_static_bot': [
       'android', 'cast', 'gn', 'clang', 'debug_static_bot',
     ],
 
     'android_clang_asan_findbugs_gn_debug_bot_minimal_symbols': [
       'android', 'clang', 'asan', 'findbugs', 'gn',
       'debug_bot_minimal_symbols',
     ],
 
     'android_clang_asan_findbugs_gn_debug_trybot': [
@@ skipping 39 matching lines @@
     ],
 
     'android_cronet_gn_release_bot_minimal_symbols_x86': [
       'android', 'cronet', 'gn', 'release_bot_minimal_symbols', 'x86'
     ],
 
     'android_gn_debug_bot': [
       'android', 'gn', 'debug_bot',
     ],
 
-    'android_gn_debug_bot_minimal_symbols': [
-      'android', 'gn', 'debug_bot_minimal_symbols',
-    ],
-
     'android_gn_debug_static_bot': [
       'android', 'gn', 'debug_static_bot',
     ],
 
     'android_gn_debug_static_bot_arm64': [
       'android', 'gn', 'debug_static_bot', 'arm64',
     ],
 
     'android_gn_debug_static_bot_x64': [
       'android', 'gn', 'debug_static_bot', 'x64',
     ],
 
     'android_gn_debug_static_bot_x86': [
       'android', 'gn', 'debug_static_bot', 'x86',
     ],
 
     'android_gn_debug_static_minimal_symbols_mipsel': [
       'android', 'gn', 'debug', 'static', 'minimal_symbols', 'mipsel',
     ],
 
     'android_gn_debug_static_trybot': [
       'android', 'gn', 'debug_static_trybot',
     ],
 
     'android_gn_debug_static_trybot_arm64': [
       'android', 'gn', 'debug_static_trybot', 'arm64',
     ],
 
-    'android_gn_debug_trybot': [
-      'android', 'gn', 'debug_trybot',
-    ],
-
     'android_gn_debug_trybot_java_coverage': [
       'android', 'gn', 'debug_trybot', 'java_coverage',
     ],
 
     'android_gn_debug_trybot_mipsel': [
       'android', 'gn', 'debug_trybot', 'mipsel',
     ],
 
     'android_gn_debug_trybot_x64': [
       'android', 'gn', 'debug_trybot', 'x64',
@@ skipping 374 matching lines @@
     # It is an error to actually use one of these configs to generate the
     # build files.
     'ios_gn': [ 'gn', 'error'],
 
     'ios_gyp': ['gyp', 'error'],
 
     'mac_views_browser_gyp_release_bot': [
       'mac_views_browser', 'gyp', 'release_bot',
     ],
 
+    'mac_views_browser_gyp_release_trybot': [
+      'mac_views_browser', 'gyp', 'release_trybot',
+    ],
+
     # This is used to indicate that the bot runs the nacl annotator-based
     # configs and switching them is out of scope for MB.
     'nacl_annotator': [ 'error' ],
 
     # This is used for tracking purposes; any bot that uses this config
     # should never actually run MB.
     'none': [
       'error',
     ],
 
@@ skipping 901 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',
     },
   },
 }