diff options
| author | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-07 18:45:59 +0000 |
|---|---|---|
| committer | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-07 18:45:59 +0000 |
| commit | 2fa89ef4d24b0cb46be663192f058677d7637f9d (patch) | |
| tree | c43d254638247bfdad05305fcfcd6a28f0ba5cce /content/content_app.gypi | |
| parent | 8c550bd1caf59ea05e0c975f0841a357f2360a5b (diff) | |
| download | chromium_src-2fa89ef4d24b0cb46be663192f058677d7637f9d.zip chromium_src-2fa89ef4d24b0cb46be663192f058677d7637f9d.tar.gz chromium_src-2fa89ef4d24b0cb46be663192f058677d7637f9d.tar.bz2 | |
Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium.
If this change breaks some bots, please try restarting the
bot before reverting it. http://crrev.com/264460 may not be
effective yet until restarting.
See the bug and http://crrev.com/255129 for the details.
BUG=345554
Review URL: https://codereview.chromium.org/258433005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_app.gypi')
| -rw-r--r-- | content/content_app.gypi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/content_app.gypi b/content/content_app.gypi index 4d10317..0a873a4 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', |