diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 21:58:48 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 21:58:48 +0000 |
| commit | 3e34e7536fe6395d5f95c51bc48aaed40fc2b7af (patch) | |
| tree | a45e2e0fc35655052c297f7a3141ad359261137f /build/common.gypi | |
| parent | 6cd1437324ac16c4bf43d4cdc82644687cd07f2c (diff) | |
| download | chromium_src-3e34e7536fe6395d5f95c51bc48aaed40fc2b7af.zip chromium_src-3e34e7536fe6395d5f95c51bc48aaed40fc2b7af.tar.gz chromium_src-3e34e7536fe6395d5f95c51bc48aaed40fc2b7af.tar.bz2 | |
Pulling in new gyp version with product_name support on windows.
Dropping setting that conflicts with this in common.gpyi
Review URL: http://codereview.chromium.org/112019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 586729a..1c44d9a0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -391,7 +391,6 @@ }, 'VCLibrarianTool': { 'AdditionalOptions': '/ignore:4221', - 'OutputFile': '$(OutDir)\\lib\\$(ProjectName).lib', 'AdditionalLibraryDirectories': '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib', }, |