diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 09:15:05 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 09:15:05 +0000 |
| commit | 9beaf2987dfc53dc150ac8c22336ea5046da005c (patch) | |
| tree | 691df5aca5967b5827c7040fc579230a4d674500 /base | |
| parent | 59e2c39984b9a34bbb72db1f3a02be171dc9726d (diff) | |
| download | chromium_src-9beaf2987dfc53dc150ac8c22336ea5046da005c.zip chromium_src-9beaf2987dfc53dc150ac8c22336ea5046da005c.tar.gz chromium_src-9beaf2987dfc53dc150ac8c22336ea5046da005c.tar.bz2 | |
Revert 38882 - Land http://codereview.chromium.org/576001 again temporarily.
TBR=jar,antonm
Review URL: http://codereview.chromium.org/596083
TBR=glider@chromium.org
Review URL: http://codereview.chromium.org/604063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 6ea94c8..fe1aae8 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -145,10 +145,12 @@ '<(tcmalloc_dir)/src/static_vars.h', '<(tcmalloc_dir)/src/symbolize.cc', '<(tcmalloc_dir)/src/symbolize.h', + '<(tcmalloc_dir)/src/symbolize_linux.cc', '<(tcmalloc_dir)/src/system-alloc.cc', '<(tcmalloc_dir)/src/system-alloc.h', '<(tcmalloc_dir)/src/tcmalloc.cc', '<(tcmalloc_dir)/src/tcmalloc_guard.h', + '<(tcmalloc_dir)/src/tcmalloc_linux.cc', '<(tcmalloc_dir)/src/thread_cache.cc', '<(tcmalloc_dir)/src/thread_cache.h', '<(tcmalloc_dir)/src/windows/config.h', @@ -184,6 +186,10 @@ # Included by allocator_shim.cc for maximal inlining. 'generic_allocators.cc', 'win_allocator.cc', + '<(tcmalloc_dir)/src/tcmalloc.cc', + + # Unneeded on Windows, symbolize_linux.cc used there instead. + '<(tcmalloc_dir)/src/symbolize.cc', # We simply don't use these, but list them above so that IDE # users can view the full available source for reference, etc. @@ -285,8 +291,9 @@ '<(tcmalloc_dir)/src/system-alloc.cc', '<(tcmalloc_dir)/src/system-alloc.h', - # included by allocator_shim.cc - '<(tcmalloc_dir)/src/tcmalloc.cc', + # 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', @@ -320,6 +327,17 @@ '<(jemalloc_dir)/qr.h', '<(jemalloc_dir)/rb.h', + # TODO(willchan): Return to using this when page_heap_linux.cc + # becomes unnecessary. + '<(tcmalloc_dir)/src/page_heap.cc', + ], + # TODO(willchan): This is actually just a branched copy of the + # vanilla upstream page_heap.cc. The current forked copy of + # page_heap.cc has Windows-specific code in it so Linux can't + # use it. These need to be refactored so we can track changes + # to the upstream page_heap.cc without duplication. + 'sources': [ + '<(tcmalloc_dir)/src/page_heap_linux.cc', ], 'cflags!': [ '-fvisibility=hidden', |