From 9ec47b1e9264d6d95921cd96cc72f87e5f29144e Mon Sep 17 00:00:00 2001
From: Henrik Kjellander <kjellander@webrtc.org>
Date: Tue, 9 May 2017 11:09:02 +0200
Subject: [PATCH] MB: Add Win32 ASan bot and remove download of SyzyASan
 binaries.

BUG=chromium:677380
TBR=ehmaldonado@webrtc.org

Review-Url: https://codereview.webrtc.org/2870883002 .
Cr-Commit-Position: refs/heads/master@{#18062}
---
 DEPS                          | 11 -----------
 tools_webrtc/mb/mb_config.pyl | 10 +---------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/DEPS b/DEPS
index bb234f5700..7d22dc560b 100644
--- a/DEPS
+++ b/DEPS
@@ -488,17 +488,6 @@ hooks = [
                 '-d', 'src/tools/luci-go/linux64',
     ],
   },
-  # Pull the Syzygy binaries, used for optimization and instrumentation.
-  {
-    'name': 'syzygy-binaries',
-    'pattern': '.',
-    'action': ['python',
-               'src/build/get_syzygy_binaries.py',
-               '--output-dir=src/third_party/syzygy/binaries',
-               '--revision=a8456d9248a126881dcfb8707ca7dcdae56e1ac7',
-               '--overwrite',
-    ],
-  },
   {
     # Pull sanitizer-instrumented third-party libraries if requested via
     # GYP_DEFINES.
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index 3c16f221a8..da91186933 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -72,7 +72,7 @@
       'Win32 Release (Clang)': 'win_clang_release_bot_x86',
       'Win64 Debug (Clang)': 'win_clang_debug_bot_x64',
       'Win64 Release (Clang)': 'win_clang_release_bot_x64',
-      'Win SyzyASan': 'win_syzyasan_release_bot_x86',
+      'Win32 ASan': 'win_asan_clang_release_bot_x86',
       'Win32 Release [large tests]': 'release_bot_x86',
     },
     'client.webrtc.perf': {
@@ -104,7 +104,6 @@
       'Android ASan (swarming)': 'android_asan_shared_release_bot_arm',
       # Windows
       'Win (swarming)': 'release_bot_x86',
-      'Win32 ASan (swarming)': 'win_asan_clang_release_bot_x86',
       'Win64 Debug (Win8)': 'debug_bot_x64',
       'Win64 Debug (Win10)': 'debug_bot_x64',
     },
@@ -267,9 +266,6 @@
       'gn', 'asan', 'clang',  'full_symbols', 'openh264_release_bot', 'x86',
       'win_fastlink',
     ],
-    'win_syzyasan_release_bot_x86': [
-      'gn', 'syzyasan', 'minimal_symbols', 'openh264_release_bot', 'x86',
-    ],
 
     # Mac
     'mac_asan_clang_release_bot_x64': [
@@ -439,10 +435,6 @@
       'mixins': ['release', 'dcheck_always_on', 'goma'],
     },
 
-    'syzyasan': {
-      'gn_args': 'is_syzyasan=true',
-    },
-
     'tsan': {
       'gn_args': 'is_tsan=true',
     },