From 8d24f8d8f9db0a2bf6ee056aac67a3fdc515f764 Mon Sep 17 00:00:00 2001 From: "dmikurube@chromium.org" Date: Thu, 27 Mar 2014 16:05:44 +0000 Subject: 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 --- chrome/chrome_android.gypi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/chrome_android.gypi') diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 1109343..48e8cdb 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -39,7 +39,8 @@ }], ], }], - [ 'android_use_tcmalloc==1', { + # TODO(dmikurube): Kill android_use_tcmalloc. http://crbug.com/345554 + [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and android_use_tcmalloc==1)', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], }], -- cgit v1.1