From 1bdb383d4338a68b88bcdb96852592c933544595 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 18 May 2015 14:43:26 -0700 Subject: [PATCH] win: Disable oilpan plugin when doing asan builds. The oilpan plugin requires trunk clang on Windows, but the asan lkgr bot uses a pinned, slightly older clang and it times out when using head clang. Disable the plugin on asan until we have resolved this. BUG=489123,489123 R=hans@chromium.org, rnk@chromium.org Review URL: https://codereview.chromium.org/1142733003 Cr-Commit-Position: refs/heads/master@{#330432} --- build/common.gypi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/common.gypi b/build/common.gypi index 2f5ea2d1ca40..da1ce693b320 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2360,6 +2360,12 @@ ], }], + ['OS=="win" and asan==1', { + # TODO(thakis): Enable this once the lkgr asan bot has caught up + # with trunk clang, http://crbug.com/489123 , http://crbug.com/489123 + 'blink_gc_plugin%': 0, + }], + ['OS=="win" and (clang==1 or asan==1)', { 'chromium_win_pch': 0, }], -- 2.11.4.GIT