diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-26 14:50:13 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-26 14:50:13 +0000 |
| commit | 96a1e3abc64ade9fb24990d25c0bb530f722b9a0 (patch) | |
| tree | 80a43f8de2ddccea437521976c9d94b7a701dfb4 /base/allocator | |
| parent | c0fbaed2be9b4df04c8cc9fe3f5c1c41b3459ca0 (diff) | |
| download | chromium_src-96a1e3abc64ade9fb24990d25c0bb530f722b9a0.zip chromium_src-96a1e3abc64ade9fb24990d25c0bb530f722b9a0.tar.gz chromium_src-96a1e3abc64ade9fb24990d25c0bb530f722b9a0.tar.bz2 | |
Convert the existing .gyp configuration to use the new base\allocator
library with upstream source code from the new vendor branch patterns
in third_party\jemalloc and third_party\tcmalloc.
BUG=27911
TEST=none
Review URL: http://codereview.chromium.org/435040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
| -rw-r--r-- | base/allocator/allocator.gyp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 1e65bca..a0ba1f92 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -204,7 +204,6 @@ }], ['OS=="linux"', { 'sources!': [ - '<(tcmalloc_dir)/src/page_heap.cc', '<(tcmalloc_dir)/src/system-alloc.h', '<(tcmalloc_dir)/src/windows/port.cc', '<(tcmalloc_dir)/src/windows/port.h', @@ -219,6 +218,18 @@ '<(jemalloc_dir)/ql.h', '<(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', |