Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: base/base.gyp

Issue 386016: Experiment: enable TCMalloc on Linux by default. (Closed)
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/leak_annotations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index bcb88f6debf5c28e3a3fe97dc11d85bf195ca87c..37ce60b014851f8a22f8a3516fbc316f9d71d9cb 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -379,30 +379,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',
],
@@ -684,6 +666,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',
« no previous file with comments | « no previous file | base/leak_annotations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698