| Index: sync/sync_tests.gypi
|
| diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
|
| index 5b6ed10430010cf2925a2bd81a94f56c3b8b7cc0..d3d85621cdc975ff6bf91ea248756de69cef5834 100644
|
| --- a/sync/sync_tests.gypi
|
| +++ b/sync/sync_tests.gypi
|
| @@ -490,7 +490,8 @@
|
| # TODO(akalin): This is needed because histogram.cc uses
|
| # leak_annotations.h, which pulls this in. Make 'base'
|
| # propagate this dependency.
|
| - ['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',
|
| ],
|
|
|