Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 422c4aa5f065a795a129a30d9f22f7c27e87c1eb..f22bd1383f715ff35865bdf69a11de1294619c0f 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -1971,7 +1971,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', |
], |
@@ -2216,7 +2217,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', |
], |
@@ -2305,7 +2307,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', |
], |
@@ -2927,7 +2930,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', |
], |