diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 19:10:32 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 19:10:32 +0000 |
| commit | 42808d199da05deda01d67a85a5f67b6ed3b31ac (patch) | |
| tree | 73619acd4e586a5ce284fe414373d7e4d1e57e58 | |
| parent | 928b4088744cfb820c674106ed1d58d2067fc386 (diff) | |
| download | chromium_src-42808d199da05deda01d67a85a5f67b6ed3b31ac.zip chromium_src-42808d199da05deda01d67a85a5f67b6ed3b31ac.tar.gz chromium_src-42808d199da05deda01d67a85a5f67b6ed3b31ac.tar.bz2 | |
Enable TCMalloc on Linux by default.
BUG=36687
Review URL: http://codereview.chromium.org/854005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41457 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rwxr-xr-x | chrome/chrome_renderer.gypi | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index a5a810e..5ebbfc8 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -203,7 +203,7 @@ 'linux_strip_binary%': 0, # Enable TCMalloc. - 'linux_use_tcmalloc%': 0, + 'linux_use_tcmalloc%': 1, # Set to select the Title Case versions of strings in GRD files. 'use_titlecase_in_grd_files%': 0, diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index a9eb009..e955f92 100755 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -184,6 +184,14 @@ }], # Linux-specific rules. ['OS=="linux"', { + 'conditions': [ + [ 'linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }, + ], + ], 'dependencies': [ '../build/linux/system.gyp:gtk', '../sandbox/sandbox.gyp:sandbox', |