| Index: webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp
|
| diff --git a/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp b/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp
|
| index 9c5018eba3b8b4b2c6a8e690b01ad76aa63a5f66..47014fb2dcc780466a8ddb89ce2f0a19b539e38a 100644
|
| --- a/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp
|
| +++ b/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp
|
| @@ -39,7 +39,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': [
|
| '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| ],
|
|
|