| Index: sql/sql.gyp
|
| diff --git a/sql/sql.gyp b/sql/sql.gyp
|
| index 7add51cf258429403356b0ebd5130a5f1ff1b095..0d861a89535c2d7acef748e55218fd7c273fb415 100644
|
| --- a/sql/sql.gyp
|
| +++ b/sql/sql.gyp
|
| @@ -99,7 +99,8 @@
|
| 'conditions': [
|
| ['os_posix==1 and OS!="mac" 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',
|
| ],
|
|
|