Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index d09200e3e91a259fa59cb73e58ad919ffcaa3d5b..5d2b6ca4f3b36ef3a216d0770a2d49736239b91f 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -1984,7 +1984,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', |
], |
@@ -2229,7 +2230,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', |
], |
@@ -2318,7 +2320,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', |
], |
@@ -2922,7 +2925,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', |
], |