| Index: ash/ash.gyp
|
| diff --git a/ash/ash.gyp b/ash/ash.gyp
|
| index 9da87bb3fa9ac46b144d005efd381460364e4d65..15a2ac47b5a1cb524a0a8acc5d1d6d822174c058 100644
|
| --- a/ash/ash.gyp
|
| +++ b/ash/ash.gyp
|
| @@ -1023,7 +1023,8 @@
|
| ['exclude', 'display/resolution_notification_controller_unittest.cc'],
|
| ],
|
| }],
|
| - ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1', {
|
| + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| + ['OS=="linux" and component=="shared_library" and ((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',
|
| ],
|
|
|