| Index: ui/app_list/app_list.gyp
|
| diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
|
| index 91e5bf4a3c4dd7b46b616d6f3fc2f21b4fc940b4..a0ba9133cd3a3a3e73573ee32b4dba15f3e4bcd3 100644
|
| --- a/ui/app_list/app_list.gyp
|
| +++ b/ui/app_list/app_list.gyp
|
| @@ -259,7 +259,8 @@
|
| ],
|
| }],
|
| # See http://crbug.com/162998#c4 for why this is needed.
|
| - ['OS=="linux" and linux_use_tcmalloc==1', {
|
| + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| + ['OS=="linux" and ((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',
|
| # The following two dependencies provide the missing
|
|
|