| Index: ipc/ipc.gyp
|
| diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
|
| index e546a990b49f9fbedfec28b6ac2f283a52674a37..c5c51855d6133ce85d44d8dd6f69f962cfdc7bcd 100644
|
| --- a/ipc/ipc.gyp
|
| +++ b/ipc/ipc.gyp
|
| @@ -79,7 +79,8 @@
|
| }],
|
| ['os_posix == 1 and OS != "mac" and OS != "android"', {
|
| 'conditions': [
|
| - ['linux_use_tcmalloc==1', {
|
| + # 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)', {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator',
|
| ],
|
| @@ -122,7 +123,8 @@
|
| }],
|
| ['os_posix == 1 and OS != "mac" and OS != "android"', {
|
| 'conditions': [
|
| - ['linux_use_tcmalloc==1', {
|
| + # 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)', {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator',
|
| ],
|
|
|