summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 21:45:10 +0000
committersebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 21:45:10 +0000
commit086a63efda145a1208ef61539dafc85da394553d (patch)
tree1dfb272ff5e293a3fb5ebb88f9bb73e8a7c3b1e7
parentaf90590e79e8ff88740f322ae68b516264e41245 (diff)
downloadchromium_src-086a63efda145a1208ef61539dafc85da394553d.zip
chromium_src-086a63efda145a1208ef61539dafc85da394553d.tar.gz
chromium_src-086a63efda145a1208ef61539dafc85da394553d.tar.bz2
Adds Windows support to the chromium_builder_asan target.
BUG= Review URL: https://codereview.chromium.org/25492004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226310 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all.gyp28
1 files changed, 23 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 4323061..aa5557b 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -485,12 +485,30 @@
# We refer to content_shell directly rather than all_webkit
# because we don't want the _unittests binaries.
- '../content/content.gyp:content_browsertests',
'../content/content.gyp:content_shell',
-
- '../net/net.gyp:dns_fuzz_stub',
- ],
- },
+ ],
+ 'conditions': [
+ ['OS!="win"', {
+ 'dependencies': [
+ '../content/content.gyp:content_browsertests',
+ '../net/net.gyp:dns_fuzz_stub',
+ ],
+ }],
+ ['OS=="win" and fastbuild==0 and target_arch=="ia32"', {
+ 'dependencies': [
+ '../chrome/chrome_syzygy.gyp:chrome_dll_syzygy',
+ '../content/content.gyp:content_shell_syzyasan',
+ ],
+ 'conditions': [
+ ['chrome_multiple_dll==1', {
+ 'dependencies': [
+ '../chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy',
+ ],
+ }],
+ ],
+ }],
+ ],
+ },
], # targets
}],
['OS=="mac"', {