Index: crypto/crypto.gyp |
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp |
index 1f22aa9eb94421d8ba5063b8046266660a124103..cb71fb021f0ee16916f77cbbeed7bacb5c46ce7a 100644 |
--- a/crypto/crypto.gyp |
+++ b/crypto/crypto.gyp |
@@ -277,7 +277,8 @@ |
'conditions': [ |
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { |
'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': [ |
'../base/allocator/allocator.gyp:allocator', |
], |