From d03bd35e43ba11928533763d280866fd8db6a23d Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Mon, 19 May 2014 00:52:29 +0000 Subject: 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 --- base/allocator/allocator.gyp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'base/allocator') 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', -- cgit v1.1