diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 22:10:22 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 22:10:22 +0000 |
| commit | 20d9685da5bcbfb097882b5d797f34637d9fe792 (patch) | |
| tree | 012f8dd39182c2df1b1f223fef63cb8e2c8456a4 /third_party/tcmalloc/tcmalloc.gyp | |
| parent | 97e3edc23314c476859c22c8db601f9b3dec552d (diff) | |
| download | chromium_src-20d9685da5bcbfb097882b5d797f34637d9fe792.zip chromium_src-20d9685da5bcbfb097882b5d797f34637d9fe792.tar.gz chromium_src-20d9685da5bcbfb097882b5d797f34637d9fe792.tar.bz2 | |
Revert "Issue 172109: Enable scavenging in RenderThread::IdleHandler."
This reverts commit r26264.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/tcmalloc.gyp')
| -rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp index d3fdb39..ddc85ee 100644 --- a/third_party/tcmalloc/tcmalloc.gyp +++ b/third_party/tcmalloc/tcmalloc.gyp @@ -44,13 +44,6 @@ }, }, }, - 'conditions': [ - ['OS=="win"', { - 'defines': [ - ['PERFTOOLS_DLL_DECL', ''] - ], - }], - ], }, 'sources': [ 'config.h', @@ -77,6 +70,7 @@ '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', @@ -126,8 +120,6 @@ # tcmalloc forked files 'allocator_shim.cc', 'generic_allocators.cc', - 'malloc_extension.cc', - 'google/malloc_extension.h', 'page_heap.cc', 'page_heap.h', 'port.cc', @@ -149,8 +141,6 @@ '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 @@ -174,9 +164,6 @@ }, 'conditions': [ ['OS=="win"', { - 'defines': [ - ['PERFTOOLS_DLL_DECL', ''] - ], 'dependencies': [ 'libcmt', ], |