| Index: content/content_shell.gypi
|
| diff --git a/content/content_shell.gypi b/content/content_shell.gypi
|
| index 2d53996a0474fe1f953ec3c0d9104d3412ec15ce..3b35324683c6af41f6354d130349e3b608c840dd 100644
|
| --- a/content/content_shell.gypi
|
| +++ b/content/content_shell.gypi
|
| @@ -301,8 +301,7 @@
|
| '../components/components.gyp:breakpad_host',
|
| ],
|
| }],
|
| - # TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554
|
| - ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))', {
|
| + ['(OS=="linux" or OS=="android") and use_allocator!="none"', {
|
| 'dependencies': [
|
| # This is needed by content/app/content_main_runner.cc
|
| '../base/allocator/allocator.gyp:allocator',
|
|
|