Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Unified Diff: url/url.gyp

Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « url/BUILD.gn ('k') | webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/url.gyp
diff --git a/url/url.gyp b/url/url.gyp
index d47748cb54969f09c735ac701a1bfe3fb7bed633..bb617f1c13c5654bca3c3ab164eb6a867ecccd9f 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',
« no previous file with comments | « url/BUILD.gn ('k') | webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698