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

Unified Diff: content/content_tests.gypi

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 | « content/content_shell.gypi ('k') | courgette/courgette.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 907b7564ee352c92ca7c7e1c783418e11287206e..0763fbde4f86f7ff2e886778ea6a7aae97f7ae87 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1311,9 +1311,10 @@
'<(angle_path)/src/build_angle.gyp:libGLESv2',
],
}],
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
['(OS=="win" and win_use_allocator_shim==1) or '
'(os_posix == 1 and OS != "android" and '
- ' linux_use_tcmalloc==1)', {
+ ' ((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 | « content/content_shell.gypi ('k') | courgette/courgette.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698