diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-06 12:42:36 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-06 12:42:36 +0000 |
| commit | 8b8832e0dff8ed9dc44b6210c393585183935979 (patch) | |
| tree | f3dd0a2758d938e3491124c0a020ad8f1f1076ba /chrome | |
| parent | 6289beb1a1caa052d9379923e2a7a344edb74839 (diff) | |
| download | chromium_src-8b8832e0dff8ed9dc44b6210c393585183935979.zip chromium_src-8b8832e0dff8ed9dc44b6210c393585183935979.tar.gz chromium_src-8b8832e0dff8ed9dc44b6210c393585183935979.tar.bz2 | |
Convert tcmalloc (and its modified libcmt) to building with gyp.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/119265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll.vcproj | 4 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj index 094962e..d8d57ac 100644 --- a/chrome/app/chrome_dll.vcproj +++ b/chrome/app/chrome_dll.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib" + AdditionalDependencies="$(OutDir)\obj\global_intermediate\tcmalloc\libcmt.lib" OutputFile="$(IntDir)\chrome.dll" LinkIncremental="1" IgnoreDefaultLibraryNames="libcmtd.lib" @@ -126,7 +126,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib" + AdditionalDependencies="$(OutDir)\obj\global_intermediate\tcmalloc\libcmt.lib" OutputFile="$(OutDir)\chrome.dll" IgnoreDefaultLibraryNames="libcmt.lib" ImportLibrary="$(OutDir)\lib\$(ProjectName).lib" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 3432372..dc498ed 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3698,6 +3698,7 @@ '../third_party/modp_b64/modp_b64.gyp:*', '../third_party/npapi/npapi.gyp:*', '../third_party/sqlite/sqlite.gyp:*', + '../third_party/tcmalloc/tcmalloc.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/tools/test_shell/test_shell.gyp:*', '../webkit/webkit.gyp:*', @@ -3727,12 +3728,6 @@ ], }, { - 'target_name': 'tcmalloc', - 'type': '<(library)', - 'msvs_guid': 'C564F145-9172-42C3-BFCB-60FDEA124321', - 'msvs_existing_vcproj': '../third_party/tcmalloc/tcmalloc.vcproj', - }, - { 'target_name': 'chrome_dll', 'type': 'shared_library', 'product_name': 'chrome', @@ -3750,10 +3745,10 @@ 'worker', '../build/util/build_util.gyp:lastchange', '../net/net.gyp:net_resources', + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', '../views/views.gyp:views', '../webkit/webkit.gyp:webkit_resources', '../gears/gears.gyp:gears', - 'tcmalloc', ], 'rules': [ { |