diff options
| author | iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 21:18:54 +0000 |
|---|---|---|
| committer | iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 21:18:54 +0000 |
| commit | 696de4e67da5eaf5447b9eb72697611e3c65f701 (patch) | |
| tree | 52df454feea0e2b05c20ac2cde9eb42d33d92d17 /build/all.gyp | |
| parent | 98f531808bb3c81a8e346642c3e97dd2d1cfcba1 (diff) | |
| download | chromium_src-696de4e67da5eaf5447b9eb72697611e3c65f701.zip chromium_src-696de4e67da5eaf5447b9eb72697611e3c65f701.tar.gz chromium_src-696de4e67da5eaf5447b9eb72697611e3c65f701.tar.bz2 | |
Allow windows ASAN build to work
Rolls DEPS for syzygy r1083 => r1194. Changelog is too long to put here.
BUG=152226
Review URL: https://chromiumcodereview.appspot.com/11377146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index bcbb259..e98430c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -167,7 +167,7 @@ 'target_name': 'All_syzygy', 'type': 'none', 'conditions': [ - ['OS=="win" and fastbuild==0', { + ['OS=="win" and fastbuild==0 and asan!=1', { 'dependencies': [ '../chrome/installer/mini_installer_syzygy.gyp:*', ], |