summaryrefslogtreecommitdiffstats
path: root/ui/keyboard
diff options
context:
space:
mode:
authordmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-07 18:45:59 +0000
committerdmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-07 18:45:59 +0000
commit2fa89ef4d24b0cb46be663192f058677d7637f9d (patch)
treec43d254638247bfdad05305fcfcd6a28f0ba5cce /ui/keyboard
parent8c550bd1caf59ea05e0c975f0841a357f2360a5b (diff)
downloadchromium_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 'ui/keyboard')
-rw-r--r--ui/keyboard/keyboard.gyp3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
index c4ca714..e780048 100644
--- a/ui/keyboard/keyboard.gyp
+++ b/ui/keyboard/keyboard.gyp
@@ -99,8 +99,7 @@
'keyboard_controller_unittest.cc',
],
'conditions': [
- # 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': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],