| Index: content/content_shell.gypi
|
| diff --git a/content/content_shell.gypi b/content/content_shell.gypi
|
| index 6626619ccb02d42d549a640ebb0fdebada95aecb..f11adf9755195bbfb176ae4d39d12c14a16b60b7 100644
|
| --- a/content/content_shell.gypi
|
| +++ b/content/content_shell.gypi
|
| @@ -315,8 +315,8 @@
|
| '../components/components.gyp:breakpad_host',
|
| ],
|
| }],
|
| - # 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))) or (android_use_tcmalloc==1)', {
|
| + # TODO(dmikurube): Kill {linux|android}_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 ((OS=="linux" and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))))', {
|
| 'dependencies': [
|
| # This is needed by content/app/content_main_runner.cc
|
| '../base/allocator/allocator.gyp:allocator',
|
|
|