diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-04 06:40:16 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-04 06:40:16 +0000 |
| commit | 1f9471a6fa3f37d206fc56132bb62234e4de3daf (patch) | |
| tree | 75ad845c8d3d3d5bae57a0e1e3020c25fd9ec26f /base/allocator | |
| parent | 1c71576ea790a694ee0f3ea445a579ec8ea396f4 (diff) | |
| download | chromium_src-1f9471a6fa3f37d206fc56132bb62234e4de3daf.zip chromium_src-1f9471a6fa3f37d206fc56132bb62234e4de3daf.tar.gz chromium_src-1f9471a6fa3f37d206fc56132bb62234e4de3daf.tar.bz2 | |
Removing the last remaining vsprops files (that are hooked in).
Also pulling in a newer nacl version.
Switching to use AdditionalOptions in list form.
BUG=None
TEST=None
TBR=mmentovai
Review URL: http://codereview.chromium.org/523027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
| -rw-r--r-- | base/allocator/allocator.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 78436a7..d32e368c 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -252,12 +252,12 @@ 'msvs_settings': { # TODO(sgk): merge this with build/common.gypi settings 'VCLibrarianTool=': { - 'AdditionalOptions': '/ignore:4006,4221', + 'AdditionalOptions': ['/ignore:4006,4221'], 'AdditionalLibraryDirectories': ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'], }, 'VCLinkerTool': { - 'AdditionalOptions': '/ignore:4006', + 'AdditionalOptions': ['/ignore:4006'], }, }, 'configurations': { |