| Index: gpu/gles2_conform_support/gles2_conform_support.gyp
|
| diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp
|
| index 20a283ff9b75c460e3959f5063b4b799f141c45b..18ad18b584e36f2745bb010304b96bc2cddae799 100644
|
| --- a/gpu/gles2_conform_support/gles2_conform_support.gyp
|
| +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp
|
| @@ -121,7 +121,8 @@
|
| 'dependencies': ['../../build/linux/system.gyp:gtk'],
|
| }],
|
| # See http://crbug.com/162998#c4 for why this is needed.
|
| - ['OS=="linux" and linux_use_tcmalloc==1', {
|
| + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| + ['OS=="linux" and ((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',
|
| ],
|
|
|