From 1f9471a6fa3f37d206fc56132bb62234e4de3daf Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Mon, 4 Jan 2010 06:40:16 +0000 Subject: 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 --- base/allocator/allocator.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base') 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': { -- cgit v1.1