| Index: ui/views/views.gyp
|
| diff --git a/ui/views/views.gyp b/ui/views/views.gyp
|
| index 58cc6241c27c266884d711f7e5de2b45bcd2aaf3..2b04cd16c72135858f1d4a84212d68a32e8bf9db 100644
|
| --- a/ui/views/views.gyp
|
| +++ b/ui/views/views.gyp
|
| @@ -822,7 +822,8 @@
|
| '../../base/allocator/allocator.gyp:allocator',
|
| ],
|
| }],
|
| - ['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))', {
|
| # See http://crbug.com/162998#c4 for why this is needed.
|
| 'dependencies': [
|
| '../../base/allocator/allocator.gyp:allocator',
|
|
|