summaryrefslogtreecommitdiffstats
path: root/tools/win
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-16 21:15:57 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-16 21:15:57 +0000
commitef7e5d6977942d65fad34407eca0ef9fabb9fbef (patch)
tree6f5c233c0fa065a1268d28bf7a1685a1bc3a93b8 /tools/win
parentc7336376cd6b41927426d58e23261912a12adb55 (diff)
downloadchromium_src-ef7e5d6977942d65fad34407eca0ef9fabb9fbef.zip
chromium_src-ef7e5d6977942d65fad34407eca0ef9fabb9fbef.tar.gz
chromium_src-ef7e5d6977942d65fad34407eca0ef9fabb9fbef.tar.bz2
Only build win static_initializers tool on Pro where DIA is available
Otherwise, 'all' fails when using Express toolchain. R=grt@chromium.org BUG=https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/j5xzCWuwam4 Review URL: https://codereview.chromium.org/239603002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/win')
-rw-r--r--tools/win/static_initializers/static_initializers.gyp28
1 files changed, 17 insertions, 11 deletions
diff --git a/tools/win/static_initializers/static_initializers.gyp b/tools/win/static_initializers/static_initializers.gyp
index ebf4e83..724091f 100644
--- a/tools/win/static_initializers/static_initializers.gyp
+++ b/tools/win/static_initializers/static_initializers.gyp
@@ -6,17 +6,23 @@
'variables': {
'chromium_code': 1,
},
- 'targets': [
- {
- 'target_name': 'static_initializers',
- 'type': 'executable',
- 'sources': [
- 'static_initializers.cc',
+ 'conditions': [
+ ['not msvs_express', {
+ 'targets': [
+ {
+ 'target_name': 'static_initializers',
+ 'type': 'executable',
+ 'sources': [
+ 'static_initializers.cc',
+ ],
+ 'include_dirs': [
+ '$(VSInstallDir)/DIA SDK/include',
+ ],
+ },
],
- 'include_dirs': [
- '$(VSInstallDir)/DIA SDK/include',
- ],
- },
- ],
+ }, {
+ 'targets': [],
+ }],
+ ]
}