diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 04:12:20 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 04:12:20 +0000 |
| commit | 922dea0e0c86de952ae962127d3115234e277854 (patch) | |
| tree | 0aca4a89624bccfdbee81bb8187919d363ad3644 /base/allocator | |
| parent | fe5ab23cd6a7c4b55638f235bd59247208859ce7 (diff) | |
| download | chromium_src-922dea0e0c86de952ae962127d3115234e277854.zip chromium_src-922dea0e0c86de952ae962127d3115234e277854.tar.gz chromium_src-922dea0e0c86de952ae962127d3115234e277854.tar.bz2 | |
Branch new tcmalloc_linux.cc into new chromium\src branch. Update new
base\allocator\allocator.gyp with merged changes from tcmalloc.gyp.
BUG=27911
TEST=none
Review URL: http://codereview.chromium.org/432021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
| -rw-r--r-- | base/allocator/allocator.gyp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 9c71d25..49b63ec 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -103,6 +103,7 @@ '<(tcmalloc_dir)/src/system-alloc.cc', '<(tcmalloc_dir)/src/system-alloc.h', '<(tcmalloc_dir)/src/tcmalloc.cc', + '<(tcmalloc_dir)/src/tcmalloc_linux.cc', # heap-profiler/checker/cpuprofiler '<(tcmalloc_dir)/src/base/thread_lister.c', @@ -181,6 +182,9 @@ '<(tcmalloc_dir)/src/system-alloc.cc', '<(tcmalloc_dir)/src/system-alloc.h', + # don't use linux forked version + '<(tcmalloc_dir)/src/tcmalloc_linux.cc', + # heap-profiler/checker/cpuprofiler '<(tcmalloc_dir)/src/base/thread_lister.c', '<(tcmalloc_dir)/src/base/thread_lister.h', |