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

Unified Diff: content/content_app.gypi

Issue 258433005: Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 8 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 | « components/nacl.gyp ('k') | content/content_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_app.gypi
diff --git a/content/content_app.gypi b/content/content_app.gypi
index 4d1031726ac8421217d8860bb2666b4f659a2d41..0a873a4cfa38cc5781d0bdbef8f5075448c57b35 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -35,8 +35,7 @@
'public/app/startup_helper_win.h',
],
'conditions': [
- # TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554
- ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))', {
+ ['((OS=="linux" and os_posix==1 and use_aura==1) or OS=="android") and use_allocator!="none"', {
'dependencies': [
# This is needed by app/content_main_runner.cc
'../base/allocator/allocator.gyp:allocator',
« no previous file with comments | « components/nacl.gyp ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698