| Index: content/content_tests.gypi
|
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
|
| index 907b7564ee352c92ca7c7e1c783418e11287206e..0763fbde4f86f7ff2e886778ea6a7aae97f7ae87 100644
|
| --- a/content/content_tests.gypi
|
| +++ b/content/content_tests.gypi
|
| @@ -1311,9 +1311,10 @@
|
| '<(angle_path)/src/build_angle.gyp:libGLESv2',
|
| ],
|
| }],
|
| + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| ['(OS=="win" and win_use_allocator_shim==1) or '
|
| '(os_posix == 1 and OS != "android" and '
|
| - ' linux_use_tcmalloc==1)', {
|
| + ' ((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',
|
| ],
|
|
|