| Index: ui/aura/aura.gyp
|
| diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
|
| index 43f81effcc3cd5e7834103cdc101f21a30b7010f..f3de1fbedf4b80896b79b83af4be11baf88c5fe4 100644
|
| --- a/ui/aura/aura.gyp
|
| +++ b/ui/aura/aura.gyp
|
| @@ -281,7 +281,8 @@
|
| '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
|
| ],
|
| }],
|
| - ['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': [
|
| # See http://crbug.com/162998#c4 for why this is needed.
|
| '../../base/allocator/allocator.gyp:allocator',
|
|
|