Index: content/content_shell.gypi |
diff --git a/content/content_shell.gypi b/content/content_shell.gypi |
index 00f3c86ea90c8ec9a497dfd92198eb029c4cf8ec..56981a215128e9a5e73d680628ab5059bab2122f 100644 |
--- a/content/content_shell.gypi |
+++ b/content/content_shell.gypi |
@@ -315,7 +315,8 @@ |
'../components/components.gyp:breakpad_host', |
], |
}], |
- ['(os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (android_use_tcmalloc==1)', { |
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
+ ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)))', { |
'dependencies': [ |
# This is needed by content/app/content_main_runner.cc |
'../base/allocator/allocator.gyp:allocator', |