From 2fa89ef4d24b0cb46be663192f058677d7637f9d Mon Sep 17 00:00:00 2001 From: "dmikurube@chromium.org" Date: Wed, 7 May 2014 18:45:59 +0000 Subject: 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 --- cc/cc_tests.gyp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'cc/cc_tests.gyp') diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index be7145e..25fb760 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -268,8 +268,7 @@ [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 'conditions': [ - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', + [ 'use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', @@ -328,8 +327,7 @@ } ], # See http://crbug.com/162998#c4 for why this is needed. - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', + ['OS=="linux" and use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', -- cgit v1.1