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

Unified Diff: base/base.gyp

Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 10 months 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
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index e50e84004835d97771287983e3d4db79059c2aaf..cd8f488fa43a252f4e5dfbe9778eb1fed00d2958 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -180,7 +180,8 @@
],
},
'conditions': [
- ['linux_use_tcmalloc==0', {
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or linux_use_tcmalloc==0)', {
'defines': [
'NO_TCMALLOC',
],
@@ -756,7 +757,8 @@
'message_loop/message_pump_glib_unittest.cc',
]
}],
- ['OS == "linux" and linux_use_tcmalloc==1', {
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['OS == "linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
'dependencies': [
'allocator/allocator.gyp:allocator',
],
« no previous file with comments | « ash/ash.gyp ('k') | base/security_unittest.cc » ('j') | ui/keyboard/keyboard.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698