| Index: content/content_app.gypi
|
| diff --git a/content/content_app.gypi b/content/content_app.gypi
|
| index 4d1031726ac8421217d8860bb2666b4f659a2d41..0a873a4cfa38cc5781d0bdbef8f5075448c57b35 100644
|
| --- a/content/content_app.gypi
|
| +++ b/content/content_app.gypi
|
| @@ -35,8 +35,7 @@
|
| 'public/app/startup_helper_win.h',
|
| ],
|
| 'conditions': [
|
| - # 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 os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))', {
|
| + ['((OS=="linux" and os_posix==1 and use_aura==1) or OS=="android") and use_allocator!="none"', {
|
| 'dependencies': [
|
| # This is needed by app/content_main_runner.cc
|
| '../base/allocator/allocator.gyp:allocator',
|
|
|