summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-19 00:52:29 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-19 00:52:29 +0000
commitd03bd35e43ba11928533763d280866fd8db6a23d (patch)
tree8e51bff76a552dba8f9216778f318182e76b89a6 /base
parentf8917890c2556106b20ecdb34fdd2d37f75c7fde (diff)
downloadchromium_src-d03bd35e43ba11928533763d280866fd8db6a23d.zip
chromium_src-d03bd35e43ba11928533763d280866fd8db6a23d.tar.gz
chromium_src-d03bd35e43ba11928533763d280866fd8db6a23d.tar.bz2
tcmalloc: Only include cpu profiler in profiling=1 builds.
tcmalloc's cpu profiler code introduces several static initializers, and it's never used on user machines. So only include it in profiling=1 builds. (The comment for profiling% in build/common.gypi even says that this flag controls if cpuprofiler is used.) BUG=94925 R=willchan@chromium.org Review URL: https://codereview.chromium.org/287333002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/allocator/allocator.gyp5
1 files changed, 4 insertions, 1 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 632e072..2de3aca4 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -367,7 +367,10 @@
# included by allocator_shim.cc
'debugallocation_shim.cc',
-
+ ],
+ }],
+ ['OS=="win" or profiling!=1', {
+ 'sources!': [
# cpuprofiler
'<(tcmalloc_dir)/src/base/thread_lister.c',
'<(tcmalloc_dir)/src/base/thread_lister.h',