Index: sync/sync_tests.gypi |
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi |
index e37910778c386be634ef924f148ca93b8ffe81c9..c39db38ab3179d7c4d952c9abdfd838e38dd56ea 100644 |
--- a/sync/sync_tests.gypi |
+++ b/sync/sync_tests.gypi |
@@ -480,7 +480,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', |
], |