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', |
], |