| Index: device/device_tests.gyp
|
| diff --git a/device/device_tests.gyp b/device/device_tests.gyp
|
| index b28f475b8367f425b0d79e1b236ef497ffa91a4f..46c8f3d12e7ed7901cfb00603fdad95fe99e3765 100644
|
| --- a/device/device_tests.gyp
|
| +++ b/device/device_tests.gyp
|
| @@ -59,8 +59,7 @@
|
| }],
|
| ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
|
| 'conditions': [
|
| - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| - ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
|
| + ['use_allocator!="none"', {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator',
|
| ],
|
|
|