Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 853fbbbea7e9b1ba15a46700e331033fa9884b0e..831ea2648412891eb46f891f512132d1c75ce002 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -2011,7 +2011,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', |
], |
@@ -2256,7 +2257,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', |
], |
@@ -2345,7 +2347,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', |
], |
@@ -2950,7 +2953,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', |
], |