| Index: chromeos/chromeos.gyp
|
| diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
|
| index 2dda381432caa25236b04cf80e25f0e85d146397..602d6a8ddad9f802c9f824788cafe9d406affe9b 100644
|
| --- a/chromeos/chromeos.gyp
|
| +++ b/chromeos/chromeos.gyp
|
| @@ -527,7 +527,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': [
|
| '../base/allocator/allocator.gyp:allocator',
|
| ],
|
|
|