Use use_allocator instead of android_use_tcmalloc to switch the allocator.
See https://crrev.com/177353002 and the bug for the details.
BUG=345554
Review URL: https://codereview.chromium.org/206413006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259894 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 17cf944..b79e085 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -311,8 +311,8 @@
'../components/components.gyp:breakpad_host',
],
}],
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))) or (android_use_tcmalloc==1)', {
+ # TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554
+ ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))))', {
'dependencies': [
# This is needed by content/app/content_main_runner.cc
'../base/allocator/allocator.gyp:allocator',
