summaryrefslogtreecommitdiffstats
path: root/sync/sync_tests.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'sync/sync_tests.gypi')
-rw-r--r--sync/sync_tests.gypi3
1 files changed, 2 insertions, 1 deletions
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 5b6ed10..d3d8562 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',
],