| Index: Source/platform/blink_platform_tests.gyp
|
| diff --git a/Source/platform/blink_platform_tests.gyp b/Source/platform/blink_platform_tests.gyp
|
| index ffad3968731befb40b52bef2cc235f3ae5b37f0d..fa9c986a4b613b4d87d588746d9fc5c5317fb348 100644
|
| --- a/Source/platform/blink_platform_tests.gyp
|
| +++ b/Source/platform/blink_platform_tests.gyp
|
| @@ -55,7 +55,8 @@
|
| '<@(platform_test_files)',
|
| ],
|
| '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',
|
|
|