| Index: Source/wtf/wtf_tests.gyp
|
| diff --git a/Source/wtf/wtf_tests.gyp b/Source/wtf/wtf_tests.gyp
|
| index c013797f13616d81ca0a4e16a3fff8501b5b319b..324f62388da1ac9be3ac8aca481889ea733c75d3 100644
|
| --- a/Source/wtf/wtf_tests.gyp
|
| +++ b/Source/wtf/wtf_tests.gyp
|
| @@ -46,7 +46,8 @@
|
| # Disable c4267 warnings until we fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267],
|
| 'conditions': [
|
| - ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_tcmalloc==1', {
|
| + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| + ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
|
| 'dependencies': [
|
| '<(DEPTH)/base/base.gyp:base',
|
| '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
|
|