Flip LKGR/ClusterFuzz, WebKit MSAN bots back to GYP.

There were a couple of build file issues that broke the ASAN Debug
bot and the MSAN bots on the lkgr waterfall. This CL fixes those issues,
and also flips the MSAN bots back to GYP since the main MSAN bots
are still kinda broken and it's easier to keep them all consistent.

TBR=mbarbella@chromium.org
BUG=605732

Review-Url: https://codereview.chromium.org/2048513002
Cr-Commit-Position: refs/heads/master@{#398215}

build/config/sanitizers/sanitizers.gni

@@ -116,6 +116,5 @@ prebuilt_instrumented_libraries_available =
 # unsupported or unadvisable configurations.
 #
 # For one-off testing, just comment this assertion out.
-assert(!is_debug || !(is_msan || is_lsan || is_tsan || is_ubsan ||
-                          is_ubsan_null || is_ubsan_vptr),
+assert(!is_debug || !(is_msan || is_ubsan || is_ubsan_null || is_ubsan_vptr),
        "Sanitizers should generally be used in release (set is_debug=false).")

third_party/instrumented_libraries/BUILD.gn

@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni")
 
 group("deps") {
   if (use_prebuilt_instrumented_libraries) {
-    assert(prebuilt_available,
+    assert(prebuilt_instrumented_libraries_available,
            "Prebuilt instrumented libraries are only available when " +
                "is_msan = true and msan_track_origins = {0, 2}")
     deps = [

tools/mb/mb_config.pyl

@@ -330,8 +330,8 @@
         'gn_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid',
       'ChromiumOS ASAN Release':
         'gyp_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',
+      'MSAN Release (chained origins)': 'gyp_msan_edge_release_bot',
+      'MSAN Release (no origins)': 'gyp_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',
@@ -551,7 +551,7 @@
       'WebKit Linux (dbg)': 'swarming_gn_debug_bot',
       'WebKit Linux ASAN': 'swarming_gn_asan_lsan_release_bot',
       'WebKit Linux Leak': 'swarming_gn_release_bot',
-      'WebKit Linux MSAN': 'swarming_gn_msan_release_bot',
+      'WebKit Linux MSAN': 'swarming_gyp_msan_release_bot',
       'WebKit Linux Trusty': 'swarming_gn_release_bot',
       'WebKit Linux': 'swarming_gn_release_bot',
       'WebKit Mac Builder (dbg)': 'swarming_gn_debug_bot',
@@ -1306,12 +1306,12 @@
       'gyp', 'drmemory', 'shared', 'release', 'x64',
     ],
 
-    'gn_msan_edge_release_bot': [
-      'gn', 'msan', 'edge', 'release_bot',
+    'gyp_msan_edge_release_bot': [
+      'gyp', 'msan', 'edge', 'release_bot',
     ],
 
-    'gn_msan_no_origins_edge_release_bot': [
-      'gn', 'msan_no_origins', 'edge', 'release_bot',
+    'gyp_msan_no_origins_edge_release_bot': [
+      'gyp', 'msan_no_origins', 'edge', 'release_bot',
     ],
 
     'gyp_official': [
@@ -1576,8 +1576,8 @@
       'swarming', 'gn', 'debug_trybot', 'x86',
     ],
 
-    'swarming_gn_msan_release_bot': [
-      'swarming', 'gn', 'msan', 'release_bot',
+    'swarming_gyp_msan_release_bot': [
+      'swarming', 'gyp', 'msan', 'release_bot',
     ],
 
     'swarming_gn_release_bot': [
@@ -1848,10 +1848,6 @@
       'swarming', 'gyp', 'debug_trybot',
     ],
 
-    'swarming_gyp_msan_release_bot': [
-      'swarming', 'gyp', 'msan', 'release_bot',
-    ],
-
     'swarming_gn_release_trybot_arm': [
       'swarming', 'gn', 'release_trybot', 'arm', 'crosscompile',
     ],