| Index: components/nacl.gyp
|
| diff --git a/components/nacl.gyp b/components/nacl.gyp
|
| index ea9da5534fe5b87018aa6d47d1769ab0fdf35cc7..990221e48c945ef6f9bc8c37c59ed74f365ac52f 100644
|
| --- a/components/nacl.gyp
|
| +++ b/components/nacl.gyp
|
| @@ -233,7 +233,8 @@
|
| }],
|
| ['os_posix == 1 and OS != "mac"', {
|
| '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',
|
| ],
|
|
|