diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 17:09:19 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 17:09:19 +0000 |
| commit | 720b133970287eacc348977323e1d6c3ff29cefc (patch) | |
| tree | 1ff16c73e78f8dbfd12acd6f6524d5ac11589de4 /base | |
| parent | c52933bcaaed2c5c28685d8399536c3b472dca53 (diff) | |
| download | chromium_src-720b133970287eacc348977323e1d6c3ff29cefc.zip chromium_src-720b133970287eacc348977323e1d6c3ff29cefc.tar.gz chromium_src-720b133970287eacc348977323e1d6c3ff29cefc.tar.bz2 | |
Merge r33049 (symbolize_linux.cc) to new allocator structure.
BUG=27911
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 49b63ec..1e65bca 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -99,6 +99,7 @@ '<(tcmalloc_dir)/src/maybe_threads.cc', '<(tcmalloc_dir)/src/maybe_threads.h', '<(tcmalloc_dir)/src/symbolize.cc', + '<(tcmalloc_dir)/src/symbolize_linux.cc', '<(tcmalloc_dir)/src/symbolize.h', '<(tcmalloc_dir)/src/system-alloc.cc', '<(tcmalloc_dir)/src/system-alloc.h', @@ -138,6 +139,7 @@ 'win_allocator.cc', '<(tcmalloc_dir)/src/tcmalloc.cc', + '<(tcmalloc_dir)/src/symbolize.cc', ], 'msvs_settings': { # TODO(sgk): merge this with build/common.gypi settings @@ -177,13 +179,13 @@ '<(tcmalloc_dir)/src/base/vdso_support.h', '<(tcmalloc_dir)/src/maybe_threads.cc', '<(tcmalloc_dir)/src/maybe_threads.h', - '<(tcmalloc_dir)/src/symbolize.cc', '<(tcmalloc_dir)/src/symbolize.h', '<(tcmalloc_dir)/src/system-alloc.cc', '<(tcmalloc_dir)/src/system-alloc.h', # don't use linux forked version '<(tcmalloc_dir)/src/tcmalloc_linux.cc', + '<(tcmalloc_dir)/src/symbolize_linux.cc', # heap-profiler/checker/cpuprofiler '<(tcmalloc_dir)/src/base/thread_lister.c', |