Chromium Code Reviews

Unified Diff: third_party/tcmalloc/tcmalloc.gyp

Issue 206017: Issue 172109: Enable scavenging in RenderThread::IdleHandler.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « third_party/tcmalloc/tcmalloc.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/tcmalloc.gyp
===================================================================
--- third_party/tcmalloc/tcmalloc.gyp (revision 26229)
+++ third_party/tcmalloc/tcmalloc.gyp (working copy)
@@ -44,6 +44,13 @@
},
},
},
+ 'conditions': [
+ ['OS=="win"', {
+ 'defines': [
+ ['PERFTOOLS_DLL_DECL', '']
+ ],
+ }],
+ ],
},
'sources': [
'config.h',
@@ -70,7 +77,6 @@
'tcmalloc/src/internal_logging.cc',
'tcmalloc/src/internal_logging.h',
'tcmalloc/src/linked_list.h',
- 'tcmalloc/src/malloc_extension.cc',
'tcmalloc/src/malloc_hook.cc',
'tcmalloc/src/malloc_hook-inl.h',
'tcmalloc/src/page_heap.cc',
@@ -120,6 +126,8 @@
# tcmalloc forked files
'allocator_shim.cc',
'generic_allocators.cc',
+ 'malloc_extension.cc',
+ 'google/malloc_extension.h',
'page_heap.cc',
'page_heap.h',
'port.cc',
@@ -141,6 +149,8 @@
'generic_allocators.cc',
'tcmalloc.cc',
'win_allocator.cc',
+ 'tcmalloc/src/malloc_extension.cc',
+ 'tcmalloc/src/google/malloc_extension.h',
],
'msvs_settings': {
# TODO(sgk): merge this with build/common.gypi settings
@@ -164,6 +174,9 @@
},
'conditions': [
['OS=="win"', {
+ 'defines': [
+ ['PERFTOOLS_DLL_DECL', '']
+ ],
'dependencies': [
'libcmt',
],
« no previous file with comments | « third_party/tcmalloc/tcmalloc.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine