diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 04:49:18 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 04:49:18 +0000 |
| commit | 1612e555e6a3e53c1d055f932e338d84110754d4 (patch) | |
| tree | 877abcd4d1ded67905593ac87ad4d4bbca71845e /chrome/chrome_syzygy.gyp | |
| parent | 4e6abdf0bed3afaed2156dc084cf98f59a0bfde8 (diff) | |
| download | chromium_src-1612e555e6a3e53c1d055f932e338d84110754d4.zip chromium_src-1612e555e6a3e53c1d055f932e338d84110754d4.tar.gz chromium_src-1612e555e6a3e53c1d055f932e338d84110754d4.tar.bz2 | |
Make SyzyAsan depend on 'syzyasan' GYP flag instead of 'asan==1 and OS=="win"'
We're bringing the regular Clang-based ASan to Windows and will put it behind
asan==1 like on all other platforms.
BUG=343960
Review URL: https://codereview.chromium.org/167773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_syzygy.gyp')
| -rw-r--r-- | chrome/chrome_syzygy.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/chrome_syzygy.gyp b/chrome/chrome_syzygy.gyp index ea73fa5..c2c81a1 100644 --- a/chrome/chrome_syzygy.gyp +++ b/chrome/chrome_syzygy.gyp @@ -3,7 +3,7 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="win" and asan==1', { + ['syzyasan==1', { 'variables': { 'dest_dir': '<(PRODUCT_DIR)/syzygy', 'syzygy_exe_dir': '<(DEPTH)/third_party/syzygy/binaries/exe', @@ -48,7 +48,7 @@ }], # Note, not else. ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' - '(asan!=1 or buildtype!="Official")', { + '(syzyasan!=1 or buildtype!="Official")', { 'variables': { 'dll_name': 'chrome_child', }, @@ -65,7 +65,7 @@ }, { 'conditions': [ ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' - 'asan==1 and buildtype=="Official"', { + 'syzyasan==1 and buildtype=="Official"', { 'targets': [ { 'target_name': 'chrome_child_dll_syzygy', |