Revert of Flip the last Mac GYP bots to GN (the ASAN bots)

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 145 matching lines @@
       'ClangToTLinuxLLD': 'swarming_clang_tot_lld_release_shared',
       'ClangToTLinuxLLD tester': 'none',
       'ClangToTLinuxUBSanVptr':
         'swarming_gn_clang_tot_edge_ubsan_no_recover_hack_static_release',
       'ClangToTLinuxUBSanVptr tester': 'none',
       'ClangToTMac': 'swarming_gn_clang_tot_minimal_symbols_shared_release',
       'ClangToTMac tester': 'none',
       'ClangToTMac (dbg)':
         'swarming_gn_clang_tot_minimal_symbols_shared_debug',
       'ClangToTMacASan':
-        'swarming_gn_asan_disable_nacl_clang_tot_full_symbols_static_release',
+        'swarming_gyp_asan_clang_tot_full_symbols_static_release',
       'ClangToTMacASan tester': 'none',
       'ClangToTWin':
         'swarming_gn_clang_tot_official_minimal_symbols_static_release_x86',
       'ClangToTWin tester': 'none',
       'ClangToTWin(dbg)':
         'swarming_gn_clang_tot_minimal_symbols_shared_debug_x86',
       'ClangToTWin(dbg) tester': 'none',
       'ClangToTWin(dll)':
         'swarming_gn_clang_tot_minimal_symbols_shared_release_x86',
       'ClangToTWin(dll) tester': 'none',
@@ skipping 178 matching lines @@
       'ASan Debug (32-bit x86 with V8-ARM)':
         'gn_asan_edge_v8_heap_debug_bot_hybrid',
       'ASan Release (32-bit x86 with V8-ARM)':
         'gn_asan_edge_fuzzer_v8_heap_release_bot_hybrid',
       'ASan Release Media (32-bit x86 with V8-ARM)':
         'gn_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid',
       'ChromiumOS ASAN Release':
         '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':
-        'gn_asan_disable_nacl_edge_fuzzer_v8_heap_debug_symbols_static_bot',
+      'Mac ASAN Debug': 'gyp_asan_edge_fuzzer_v8_heap_debug_symbols_static_bot',
       'Mac ASAN Release Media':
-        ('gn_asan_disable_nacl_edge_fuzzer_v8_heap_chrome'
-         '_with_codecs_release_bot'),
-      'Mac ASAN Release':
-        'gn_asan_disable_nacl_edge_fuzzer_v8_heap_release_bot',
+        'gyp_asan_edge_fuzzer_v8_heap_chrome_with_codecs_release_bot',
+      'Mac ASAN Release': 'gyp_asan_edge_fuzzer_v8_heap_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': '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',
@@ skipping 14 matching lines @@
       'ios-simulator': 'ios_gyp',
       'ios-simulator-cronet': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
     },
 
     'chromium.memory': {
       'Linux ASan LSan Builder': 'swarming_asan_lsan_gn_release_trybot',
       'Linux ASan LSan Tests (1)': 'none',
       'Linux ASan Tests (sandboxed)': 'none',
       'Mac ASan 64 Builder':
-        'swarming_asan_lsan_full_symbols_gn_disable_nacl_release_trybot',
+        'swarming_asan_lsan_full_symbols_gyp_release_trybot',
       'Mac ASan 64 Tests (1)': 'none',
       'Linux Chromium OS ASan LSan Builder':
         'swarming_asan_lsan_chromeos_gn_release_trybot',
       'Linux Chromium OS ASan LSan Tests (1)': 'none',
     },
 
     'chromium.memory.fyi': {
       'Chromium Linux ChromeOS MSan Builder':
         'swarming_gn_chromeos_msan_release_bot',
       'Chromium Linux MSan Builder':
@@ skipping 418 matching lines @@
 
     'tryserver.chromium.mac': {
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
       'ios-simulator-cronet': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
       'mac_chromium_10.10_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_10.10_macviews': 'mac_views_browser_gn_release_trybot',
       'mac_chromium_archive_rel_ng': 'noswarming_gn_release_bot_mac_strip',
-      'mac_chromium_asan_rel_ng':
-        'swarming_asan_dcheck_gn_disable_nacl_release_bot',
+      'mac_chromium_asan_rel_ng': 'swarming_asan_dcheck_gyp_release_bot',
       'mac_chromium_asan_variable': 'findit',
       'mac_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
       'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_dbg_ng': 'swarming_gn_debug_trybot',
       'mac_chromium_gyp_dbg': 'swarming_gyp_debug_trybot',
       'mac_chromium_gyp_rel': 'swarming_gyp_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
       'mac_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_variable': 'findit',
       'mac_chromium_variable_10.10': 'findit',
@@ skipping 378 matching lines @@
     'gn_release_afl_asan': [
       'gn', 'release', 'afl', 'asan', 'proprietary_codecs', 'pdf_xfa',
       'disable_nacl',
     ],
 
     'gn_release_libfuzzer_asan': [
       'gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs', 'pdf_xfa',
       'disable_nacl',
     ],
 
-    'gn_release_libfuzzer_asan': [
-      'gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs', 'pdf_xfa',
-      'disable_nacl',
-    ],
-
     'gn_release_libfuzzer_msan': [
       'gn', 'release', 'libfuzzer', 'msan', 'proprietary_codecs', 'pdf_xfa',
       'disable_nacl',
     ],
     'gn_release_libfuzzer_ubsan': [
       'gn', 'release', 'libfuzzer', 'ubsan_security', 'proprietary_codecs',
       'pdf_xfa', 'disable_nacl',
     ],
 
     'gn_release_trybot': [
@@ skipping 22 matching lines @@
     ],
 
     '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',
     ],
 
-    'gn_asan_disable_nacl_edge_fuzzer_v8_heap_chrome_with_codecs_release_bot': [
-      'gyp', 'asan', 'disable_nacl', 'edge', 'fuzzer', 'v8_heap',
-      'chrome_with_codecs', 'release_bot',
+    'gyp_asan_edge_fuzzer_v8_heap_chrome_with_codecs_release_bot': [
+      'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', 'chrome_with_codecs',
+      'release_bot',
     ],
 
-    'gn_asan_disable_nacl_edge_fuzzer_v8_heap_debug_symbols_static_bot': [
-      'gn', 'asan', 'disable_nacl', 'edge', 'fuzzer', 'v8_heap',
-      'debug_symbols_static_bot',
+    'gyp_asan_edge_fuzzer_v8_heap_debug_symbols_static_bot': [
+      'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap',  'debug_symbols_static_bot',
     ],
 
-    'gn_asan_disable_nacl_edge_fuzzer_v8_heap_release_bot': [
-      'gn', 'asan', 'disable_nacl', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
+    'gyp_asan_edge_fuzzer_v8_heap_release_bot': [
+      'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', '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_release_bot_x86': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'release_bot', 'x86',
     ],
@@ skipping 212 matching lines @@
     ],
 
     'swarming_android_gn_release_trybot': [
       'swarming', 'android', 'gn', 'release_trybot',
     ],
 
     'swarming_android_gn_release_trybot_arm64': [
       'swarming', 'android', 'gn', 'release_trybot', 'arm64',
     ],
 
-    'swarming_asan_dcheck_gn_disable_nacl_release_bot': [
-      'swarming', 'asan', 'dcheck_always_on', 'gn', 'disable_nacl',
-      'release_bot',
+    'swarming_asan_dcheck_gyp_release_bot': [
+      'swarming', 'asan', 'dcheck_always_on', 'gyp', 'release_bot',
     ],
 
     'swarming_asan_lsan_chromeos_gn_release_trybot': [
       'swarming', 'asan', 'lsan', 'chromeos', 'gn', 'release_trybot',
     ],
 
-    'swarming_asan_lsan_full_symbols_gn_disable_nacl_release_trybot': [
-      'swarming', 'asan', 'lsan', 'full_symbols', 'gn', 'disable_nacl', 
-      'release_bot', 'dcheck_always_on',
+    'swarming_asan_lsan_full_symbols_gyp_release_trybot': [
+      'swarming', 'asan', 'lsan', 'full_symbols', 'gyp', 'release_bot',
+      'dcheck_always_on',
     ],
 
     '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 203 matching lines @@
     'swarming_gyp_asan_clang_fuzzer_shared_v8_heap_x86_full_symbols_release': [
       'swarming', 'gyp', 'asan', 'clang_tot', 'fuzzer', 'shared', 'v8_heap',
       'full_symbols', 'release',
     ],
 
     '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_gn_asan_disable_nacl_clang_tot_full_symbols_static_release': [
+    'swarming_gyp_asan_clang_tot_full_symbols_static_release': [
       'swarming', 'gyp', 'asan', 'clang_tot', 'full_symbols', 'static',
       'release',
     ],
 
     'swarming_gn_chromeos_msan_release_bot': [
       'swarming', 'gn', 'chromeos', 'msan', 'release_bot',
     ],
 
     'swarming_gn_clang_debug_bot_minimal_symbols_x86': [
       'swarming', 'gn', 'clang', 'debug_bot', 'minimal_symbols', 'x86',
@@ skipping 599 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',
     },
   },
 }