| Index: remoting/remoting_host.gypi
|
| diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
|
| index 3782fff28dfbd8d2c8c9107fa0e0703a65bc83c2..ff1996f7a9ee179362250f649cc1363bb1427b64 100644
|
| --- a/remoting/remoting_host.gypi
|
| +++ b/remoting/remoting_host.gypi
|
| @@ -752,8 +752,7 @@
|
| }], # mac_breakpad==1
|
| ], # conditions
|
| }], # OS=mac
|
| - # 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))', {
|
| + ['OS=="linux" and use_allocator!="none"', {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator',
|
| ],
|
| @@ -784,8 +783,7 @@
|
| 'host/setup/me2me_native_messaging_host_main.h',
|
| ],
|
| 'conditions': [
|
| - # 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))', {
|
| + ['OS=="linux" and use_allocator!="none"', {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator',
|
| ],
|
| @@ -877,8 +875,7 @@
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| }],
|
| - # 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))', {
|
| + ['OS=="linux" and use_allocator!="none"', {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator',
|
| ],
|
|
|