diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 13 | ||||
| -rw-r--r-- | base/base.gyp | 2 |
2 files changed, 13 insertions, 2 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', diff --git a/base/base.gyp b/base/base.gyp index d225ef3..7238928 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -697,7 +697,7 @@ 'conditions': [ [ 'linux_use_tcmalloc==1', { 'dependencies': [ - '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + 'allocator/allocator.gyp:allocator', ], }, ], |