Flip most other CrOS builders 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 43 matching lines @@
       'KitKat Tablet Tester': 'android_gn_debug_static_bot',
       'Lollipop Consumer Tester': 'android_gn_debug_static_bot_arm64',
       'Lollipop Low-end Tester': 'android_gn_debug_static_bot',
       'Lollipop Phone Tester': 'android_gn_debug_static_bot',
       'Lollipop Tablet Tester': 'android_gn_debug_static_bot',
       'Marshmallow 64 bit Tester': 'android_gn_debug_static_bot_arm64',
       'Marshmallow Tablet Tester': 'android_gn_debug_static_bot',
     },
 
     'chromium.chrome': {
-      'Google Chrome ChromeOS': 'gyp_official_goma_chromeos',
+      'Google Chrome ChromeOS': 'gn_official_goma_chromeos',
       'Google Chrome Linux x64': 'gn_official_goma',
       'Google Chrome Mac': 'gyp_official_goma',
       'Google Chrome Win': 'gyp_official_goma_minimal_symbols_x86',
     },
 
     'chromium.chromiumos': {
       'ChromiumOS amd64-generic Compile': 'cros_chrome_sdk_gn',
       'ChromiumOS daisy Compile': 'cros_chrome_sdk_gn',
       'ChromiumOS x86-generic Compile': 'cros_chrome_sdk_gn',
       'Linux ChromiumOS Builder': 'swarming_chromeos_gn_release_bot',
@@ skipping 116 matching lines @@
       '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',
+        'gn_chromeos_with_codecs_debug_bot',
       'MD Top Chrome ChromeOS non-material':
-        'gyp_chromeos_with_codecs_debug_bot',
+        'gn_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',
       'LTO Linux Perf': 'gn_official_goma_lto',
       'Libfuzzer Upload Linux ASan': 'gn_release_libfuzzer_asan',
       'Libfuzzer Upload Linux ASan Debug': 'gn_debug_libfuzzer_asan',
       'Libfuzzer Upload Linux MSan': 'gn_release_libfuzzer_msan',
       'Libfuzzer Upload Linux UBSan': 'gn_release_libfuzzer_ubsan',
       'Linux ARM': 'swarming_gn_release_bot_arm',
@@ skipping 43 matching lines @@
       'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'GPU Win Builder (dbg)':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
       'GPU Win Clang Builder (dbg)':
         'swarming_gpu_fyi_tests_win_clang_debug_bot',
       'GPU Win x64 Builder':
         'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x64',
       'GPU Win x64 Builder (dbg)':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x64',
       'Linux ChromiumOS Builder':
-        'swarming_gpu_fyi_tests_chromeos_gyp_release_trybot',
+        'swarming_gpu_fyi_tests_chromeos_gn_release_trybot',
       'Linux Debug (NVIDIA)': 'none',
       'Linux Debug (New Intel)': 'none',
       'Linux Release (ATI)': 'none',
       'Linux Release (NVIDIA GeForce 730)': 'none',
       'Linux Release (NVIDIA)': 'none',
       'Linux Release (New Intel)': 'none',
       'Mac 10.10 Debug (ATI)': 'none',
       'Mac 10.10 Debug (Intel)': 'none',
       'Mac 10.10 Release (ATI)': 'none',
       'Mac 10.10 Release (Intel)': 'none',
@@ skipping 86 matching lines @@
       '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':
-        'swarming_asan_lsan_chromeos_gyp_release_bot',
+        'swarming_asan_lsan_chromeos_gn_release_bot',
       'Linux Chromium OS ASan LSan Tests (1)': 'none',
     },
 
     'chromium.memory.fyi': {
       'Chromium Linux ChromeOS MSan Builder':
-        'swarming_gyp_chromeos_msan_release_bot',
+        'swarming_gn_chromeos_msan_release_bot',
       'Chromium Linux MSan Builder':
         'swarming_msan_gn_release_bot',
       'Chromium Linux TSan Builder':
         'swarming_tsan_disable_nacl_gn_release_bot',
       'Chromium Windows Builder (DrMemory x64)':
         'gyp_drmemory_shared_release_x64',
       'Chromium Windows Builder (DrMemory)': 'gyp_drmemory_shared_release_x86',
       'Linux ChromeOS MSan Tests': 'none',
       'Linux MSan Tests': 'none',
       'Linux TSan Tests': 'none',
@@ skipping 297 matching lines @@
       'android_cronet_tester': 'android_cronet_gn_debug_static_bot',
       'android_n5x_swarming_rel': 'swarming_android_gn_release_trybot_arm64',
       'android_swarming_rel': 'swarming_android_gn_release_trybot',
       'cast_shell_android': 'android_cast_gn_debug_static_bot',
       'linux_android_dbg_ng': 'swarming_android_gn_debug_trybot',
       'linux_android_rel_ng': 'swarming_android_gn_release_trybot',
     },
 
     'tryserver.chromium.angle': {
       'linux_angle_chromeos_rel_ng':
-        'swarming_gpu_fyi_tests_chromeos_gyp_release_trybot',
+        'swarming_gpu_fyi_tests_chromeos_gn_release_trybot',
       'linux_angle_dbg_ng': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'linux_angle_rel_ng': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'mac_angle_dbg_ng': 'swarming_gpu_fyi_tests_gyp_debug_trybot',
       'mac_angle_rel_ng': 'swarming_gpu_fyi_tests_gyp_release_trybot',
       'win_angle_dbg_ng': 'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
       'win_angle_rel_ng': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'win_angle_x64_dbg_ng':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x64',
       'win_angle_x64_rel_ng':
         'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x64',
@@ skipping 14 matching lines @@
       'chromium_presubmit': 'none',
       'closure_compilation': 'closure_compilation',
       'linux_arm': 'swarming_gn_release_trybot_arm',
       'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot',
       'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gn_release_trybot',
       'linux_chromium_asan_variable': 'findit',
       'linux_chromium_browser_side_navigation_rel': 'gn_release_trybot',
       'linux_chromium_cast_variable': 'findit',
       'linux_chromium_cfi_rel_ng': 'gn_cfi_release_static_dcheck_always_on',
       'linux_chromium_chromeos_asan_rel_ng':
-        'swarming_asan_lsan_chromeos_gyp_release_trybot',
+        'swarming_asan_lsan_chromeos_gn_release_trybot',
       'linux_chromium_chromeos_asan_variable': 'findit',
       'linux_chromium_chromeos_compile_dbg_ng':
         'swarming_chromeos_gn_debug_trybot',
       'linux_chromium_chromeos_compile_rel_ng':
         'swarming_chromeos_gn_release_trybot',
       'linux_chromium_chromeos_dbg_ng':
         'swarming_chromeos_gn_debug_trybot',
       'linux_chromium_chromeos_msan_rel_ng':
-        'swarming_chromeos_msan_gyp_release_trybot',
+        'swarming_chromeos_msan_gn_release_bot',
       'linux_chromium_chromeos_ozone_rel_ng':
         'swarming_chromeos_gyp_ozone_release_trybot',
       'linux_chromium_chromeos_rel_ng': 'swarming_chromeos_gn_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_ng': 'swarming_gn_debug_trybot',
       'linux_chromium_compile_rel_ng': 'swarming_gn_release_trybot',
       'linux_chromium_dbg_32_ng': 'swarming_gn_debug_trybot_x86',
@@ skipping 521 matching lines @@
 
     'gyp_asan_lsan_edge_fuzzer_v8_heap_symbolized_release_bot': [
       'gyp', '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',
       'release_bot',
     ],
 
-    'gyp_chromeos_with_codecs_debug_bot': [
-      'gyp', 'chromeos_with_codecs', 'debug_bot',
+    'gn_chromeos_with_codecs_debug_bot': [
+      'gn', 'chromeos_with_codecs', 'debug_bot',
     ],
 
     'gyp_clang_minimal_symbols_shared_release_bot_x86': [
       'gyp', 'clang', 'minimal_symbols', 'shared_release_bot', 'x86',
     ],
 
     'gyp_debug_bot': [
       'gyp', 'debug_bot',
     ],
 
@@ skipping 22 matching lines @@
     ],
 
     'gyp_official': [
       'gyp', 'official',
     ],
 
     'gyp_official_goma': [
       'gyp', 'official', 'goma',
     ],
 
-    'gyp_official_goma_chromeos': [
-      'gyp', 'official', 'goma', 'chromeos',
+    'gn_official_goma_chromeos': [
+      'gn', 'official', 'goma', 'chromeos',
     ],
 
     'gyp_official_goma_minimal_symbols_x86': [
       'gyp', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
     'gyp_official_syzyasan': [
       'gyp', 'official', 'syzyasan',
     ],
 
@@ skipping 139 matching lines @@
     ],
 
     'swarming_android_gn_release_trybot_arm64': [
       'swarming', 'android', 'gn', 'release_trybot', 'arm64',
     ],
 
     'swarming_asan_dcheck_gyp_release_bot': [
       'swarming', 'asan', 'dcheck_always_on', 'gyp', 'release_bot',
     ],
 
-    'swarming_asan_lsan_chromeos_gyp_release_bot': [
-      'swarming', 'asan', 'lsan', 'chromeos', 'gyp', 'release_bot',
+    'swarming_asan_lsan_chromeos_gn_release_bot': [
+      'swarming', 'asan', 'lsan', 'chromeos', 'gn', 'release_bot',
     ],
 
-    'swarming_asan_lsan_chromeos_gyp_release_trybot': [
+    'swarming_asan_lsan_chromeos_gn_release_trybot': [
       'swarming', 'asan', 'lsan', 'chromeos', 'gyp', 'release_trybot',
     ],
 
-    'swarming_asan_lsan_chromeos_gyp_release_trybot': [
-      'swarming', 'asan', 'lsan', 'chromeos', 'gyp', 'release_trybot',
-    ],
-
     'swarming_asan_lsan_full_symbols_gyp_release_bot': [
       'swarming', 'asan', 'lsan', 'full_symbols', 'gyp', 'release_bot',
     ],
 
     'swarming_asan_lsan_gn_release_bot': [
       'swarming', 'asan', 'lsan', 'gn', 'release_bot',
     ],
 
     'swarming_asan_lsan_gn_release_trybot': [
       'swarming', 'asan', 'lsan', 'gn', 'release_trybot',
@@ skipping 12 matching lines @@
     ],
 
     'swarming_chromeos_gn_release_bot': [
       'swarming', 'chromeos_with_codecs', 'gn', 'release_bot',
     ],
 
     'swarming_chromeos_gn_release_trybot': [
       'swarming', 'chromeos_with_codecs', 'gn', 'release_trybot',
     ],
 
-    'swarming_chromeos_msan_gyp_release_trybot': [
-      'swarming', 'chromeos', 'msan', 'gyp', 'release_trybot',
+    'swarming_chromeos_msan_gn_release_bot': [
+      'swarming', 'chromeos', 'msan', 'gn', 'release_bot',

[Dirk Pranke, 2016/06/19 01:47:47]

this changes from _trybot to _bot because the _trybot config (which enables
DCHECKS) is generically broken w/ msan (it's broken in GYP as well).

     ],
 
     'swarming_chromeos_ozone_gyp_release_bot': [
       'swarming', 'chromeos_with_codecs', 'ozone', 'gyp', 'release_bot',
     ],
 
     'swarming_clang_tot_lld_release_shared': [
       # TODO(crbug.com/605819): Enable debug info in release builds.
       'swarming', 'gn', 'clang_tot', 'release', 'shared', 'use_lld',
     ],
@@ skipping 59 matching lines @@
     ],
 
     'swarming_gn_release_trybot': [
       'swarming', 'gn', 'release_bot',
     ],
 
     'swarming_gn_release_trybot_x64': [
       'swarming', 'gn', 'release_trybot', 'x64',
     ],
 
-    'swarming_gpu_fyi_tests_chromeos_gyp_release_trybot': [
-      'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
+    'swarming_gpu_fyi_tests_chromeos_gn_release_trybot': [
+      'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
       'release_trybot', 'angle_deqp_tests', 'chromeos',
     ],
 
     'swarming_gpu_fyi_tests_gn_debug_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
       'debug_trybot', 'angle_deqp_tests',
     ],
 
     'swarming_gpu_fyi_tests_gn_release_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
@@ skipping 85 matching lines @@
     'swarming_gyp_asan_clang_fuzzer_static_v8_heap_x86_full_symbols_release': [
       'swarming', 'gyp', 'asan', 'clang_tot', 'fuzzer', 'static', 'v8_heap',
       'full_symbols', 'release',
     ],
 
     'swarming_gyp_asan_clang_tot_full_symbols_static_release': [
       'swarming', 'gyp', 'asan', 'clang_tot', 'full_symbols', 'static',
       'release',
     ],
 
-    'swarming_gyp_chromeos_msan_release_bot': [
-      'swarming', 'gyp', 'chromeos', 'msan', 'release_bot',
+    'swarming_gn_chromeos_msan_release_bot': [
+      'swarming', 'gn', 'chromeos', 'msan', 'release_bot',
     ],
 
     'swarming_gyp_clang_debug_bot_minimal_symbols_x86': [
       'swarming', 'gyp', 'clang', 'debug_bot', 'minimal_symbols', 'x86',
     ],
 
     'swarming_gyp_clang_debug_trybot_x86': [
       'swarming', 'gyp', 'clang', 'debug_trybot', 'x86',
     ],
 
@@ skipping 579 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',
     },
   },
 }