| Index: chrome/chrome_exe.gypi
|
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
|
| index 4bf28c85c45e5e6a28605cde66d99ec10c52fcc4..a89eafa6741db7f7e155318eea4224e4b30db6ec 100644
|
| --- a/chrome/chrome_exe.gypi
|
| +++ b/chrome/chrome_exe.gypi
|
| @@ -142,7 +142,8 @@
|
| },
|
| ],
|
| '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': [
|
| '<(allocator_target)',
|
| ],
|
|
|