summaryrefslogtreecommitdiffstats
path: root/url
diff options
context:
space:
mode:
Diffstat (limited to 'url')
-rw-r--r--url/BUILD.gn3
-rw-r--r--url/url.gyp3
2 files changed, 4 insertions, 2 deletions
diff --git a/url/BUILD.gn b/url/BUILD.gn
index 941ba7d..e32d434 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -67,7 +67,8 @@ test("url_unittests") {
]
#if (is_posix && !is_mac && !is_ios) {
- # if (linux_use_tcmalloc) {
+ # # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ # if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc) {
# deps += "//base/allocator"
# }
#}
diff --git a/url/url.gyp b/url/url.gyp
index d47748c..bb617f1 100644
--- a/url/url.gyp
+++ b/url/url.gyp
@@ -54,7 +54,8 @@
'url_util_unittest.cc',
],
'conditions': [
- ['os_posix==1 and OS!="mac" and OS!="ios" and linux_use_tcmalloc==1',
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['os_posix==1 and OS!="mac" and OS!="ios" 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',