| Index: courgette/courgette.gyp
|
| diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
|
| index fbd1ced40d4556a757a807469772c0e4376ec881..591e4e2aa558d24269eb17950d24d8d5c0167138 100644
|
| --- a/courgette/courgette.gyp
|
| +++ b/courgette/courgette.gyp
|
| @@ -121,7 +121,8 @@
|
| 'conditions': [
|
| [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
|
| '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',
|
| ],
|
|
|