diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 00:17:53 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 00:17:53 +0000 |
| commit | 3c4e3015463fd407ccd932e5da17e3c4bc8e3c5c (patch) | |
| tree | 0d9eb8dc82e0514d1b77943bb452b75396f18dea /base/base.gyp | |
| parent | f820596a817c435611567e5131709162bfb6cfad (diff) | |
| download | chromium_src-3c4e3015463fd407ccd932e5da17e3c4bc8e3c5c.zip chromium_src-3c4e3015463fd407ccd932e5da17e3c4bc8e3c5c.tar.gz chromium_src-3c4e3015463fd407ccd932e5da17e3c4bc8e3c5c.tar.bz2 | |
Enable TCMalloc on Linux by default.
This change also reworks the tcmalloc dependency to be added only to chrome and test_shell, instead of base. This is necessary since otherwise tcmalloc will be double initialized (by both the main executable and dlopen'd shared objects like the npapitestplugin.so).
Add valgrind suppressions. This are invalid reads on static initialization in the VDSOSupport module. I haven't investigated it yet, but I suspect they're benign.
BUG=http://crbug.com/28149, http://crbug.com/28385
Review URL: http://codereview.chromium.org/399081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/base/base.gyp b/base/base.gyp index 86e4996..f5b9b36 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -394,30 +394,12 @@ [ 'OS == "linux" or OS == "freebsd"', { 'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'], ['exclude', '\\.mm?$' ] ], - 'variables' : { - 'linux_use_heapchecker%' : 0, - }, 'conditions': [ [ 'chromeos==1 or toolkit_views==1', { 'sources/': [ ['include', '_chromeos\\.cc$'] ] }, ], - [ 'linux_use_heapchecker==1', { - 'defines': [ - 'LINUX_USE_HEAPCHECKER', - ], - 'direct_dependent_settings': { - 'defines': [ - 'LINUX_USE_HEAPCHECKER', - ], - }, - }, - ], - # linux_use_heapchecker==1 implies linux_use_tcmalloc=1. - [ 'linux_use_tcmalloc==1 or linux_use_heapchecker==1', { - 'dependencies': [ - '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', - ], + [ 'linux_use_tcmalloc==1', { 'defines': [ 'LINUX_USE_TCMALLOC', ], @@ -713,6 +695,14 @@ 'file_version_info_unittest.cc', 'worker_pool_linux_unittest.cc', ], + 'conditions': [ + [ 'linux_use_tcmalloc==1', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + }, + ], + ], 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', |