| Index: ui/app_list/app_list.gyp
|
| diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
|
| index f5aa6167904357788a8a23b16e98a57ab8843767..284cc71cf619ff156254399f9b2490079357a68f 100644
|
| --- a/ui/app_list/app_list.gyp
|
| +++ b/ui/app_list/app_list.gyp
|
| @@ -261,7 +261,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
|
|
|