diff options
| -rw-r--r-- | base/base.gyp | 28 | ||||
| -rw-r--r-- | base/leak_annotations.h | 2 | ||||
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rwxr-xr-x | chrome/chrome.gyp | 8 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 8 |
5 files changed, 21 insertions, 27 deletions
diff --git a/base/base.gyp b/base/base.gyp index 562de8c..51aa6c8 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -384,12 +384,30 @@ [ '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_tcmalloc==1', { + [ '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', + ], 'defines': [ 'LINUX_USE_TCMALLOC', ], @@ -672,14 +690,6 @@ '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', diff --git a/base/leak_annotations.h b/base/leak_annotations.h index 7e652a5..aa57dff 100644 --- a/base/leak_annotations.h +++ b/base/leak_annotations.h @@ -5,7 +5,7 @@ #ifndef BASE_LEAK_ANNOTATIONS_H_ #define BASE_LEAK_ANNOTATIONS_H_ -#if defined(LINUX_USE_TCMALLOC) +#if defined(LINUX_USE_TCMALLOC) && defined(LINUX_USE_HEAPCHECKER) #include "third_party/tcmalloc/heap-checker.h" diff --git a/build/common.gypi b/build/common.gypi index 90b9234..4652db4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -182,7 +182,7 @@ 'linux_strip_binary%': 0, # Enable TCMalloc. - 'linux_use_tcmalloc%': 1, + 'linux_use_tcmalloc%': 0, # Set to select the Title Case versions of strings in GRD files. 'use_titlecase_in_grd_files%': 0, diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 2da3418..4b3b096 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3583,14 +3583,6 @@ 'message': 'Generating manpage' }, ], - 'conditions': [ - [ 'linux_use_tcmalloc==1', { - 'dependencies': [ - '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', - ], - }, - ], - ], 'dependencies': [ # On Linux, link the dependencies (libraries) that make up actual # Chromium functionality directly into the executable. diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 9baad37..f805b09 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -290,14 +290,6 @@ ], }], ['OS=="linux"', { - 'conditions': [ - [ 'linux_use_tcmalloc==1', { - 'dependencies': [ - '../../../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', - ], - }, - ], - ], 'dependencies': [ '../../../build/linux/system.gyp:gtk', 'test_shell_resources', |