Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2621)

Unified Diff: base/allocator/allocator.gyp

Issue 435040: Convert the existing .gyp configuration to use the new base\allocator... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: latest updates after forking page_heap_linux.cc Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/allocator.gyp
===================================================================
--- base/allocator/allocator.gyp (revision 33185)
+++ base/allocator/allocator.gyp (working copy)
@@ -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,7 +218,19 @@
'<(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',
],
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698