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

Unified Diff: ui/compositor/compositor.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
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/events/events.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.gyp
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index fbd62ef1157dbfa2dec0c113ae5a923c2c5983b5..8bdaf004e462a49ac0b5f96a43645aea6a5d7cf1 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -160,7 +160,8 @@
}],
['os_posix == 1 and OS != "mac"', {
'conditions': [
- ['linux_use_tcmalloc==1', {
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/events/events.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698