summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-01 21:17:34 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-01 21:17:34 +0000
commit2fa407804a4830274a06771aa2de6d919e8c0dbf (patch)
tree26b98c82465cb3a42a019630806607f6be079ce3 /build
parent79efa5752ce12d22383a435625883b638e7909af (diff)
downloadchromium_src-2fa407804a4830274a06771aa2de6d919e8c0dbf.zip
chromium_src-2fa407804a4830274a06771aa2de6d919e8c0dbf.tar.gz
chromium_src-2fa407804a4830274a06771aa2de6d919e8c0dbf.tar.bz2
Pulling in latest gyp with rule generation and configuration change.
BUG=None TEST=None TBR=sgk Review URL: http://codereview.chromium.org/351003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi6
1 files changed, 1 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi
index c571277..f9399cd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -357,11 +357,7 @@
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
'CharacterSet': '1',
},
- 'conditions': [
- ['OS=="win"', {
- 'configuration_platform': 'Win32',
- }],
- ],
+ 'msvs_configuration_platform': 'Win32',
},
'Debug': {
'inherit_from': ['Common'],