| Index: device/device_tests.gyp
|
| diff --git a/device/device_tests.gyp b/device/device_tests.gyp
|
| index 63c0a820737f1ed0c702a9bab26d3c7607f4cca7..0cadffb86154b5e24bacc9eacea816c0bbc9ef0d 100644
|
| --- a/device/device_tests.gyp
|
| +++ b/device/device_tests.gyp
|
| @@ -56,7 +56,8 @@
|
| }],
|
| ['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',
|
| ],
|
|
|