| Index: ui/events/events.gyp
|
| diff --git a/ui/events/events.gyp b/ui/events/events.gyp
|
| index e3030058b08c76ac0fb130dd6db5ea264296c1c4..61e646acede6a7a33e7abf339780a8beb6ca3f6e 100644
|
| --- a/ui/events/events.gyp
|
| +++ b/ui/events/events.gyp
|
| @@ -283,7 +283,8 @@
|
| 'x/events_x_unittest.cc',
|
| ],
|
| 'conditions': [
|
| - ['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': [
|
| '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| ],
|
|
|