summaryrefslogtreecommitdiffstats
path: root/ipc/ipc.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/ipc.gyp')
-rw-r--r--ipc/ipc.gyp6
1 files changed, 4 insertions, 2 deletions
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index e546a99..c5c5185 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',
],