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 /components | |
| 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 'components')
| -rw-r--r-- | components/components_tests.gyp | 3 | ||||
| -rw-r--r-- | components/nacl.gyp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 77be272..6875cec 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -445,8 +445,7 @@ '../base/allocator/allocator.gyp:allocator', ], }], - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - ['OS=="linux" and component=="shared_library" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { + ['OS=="linux" and component=="shared_library" and use_allocator!="none"', { 'dependencies': [ '<(DEPTH)/base/allocator/allocator.gyp:allocator', ], diff --git a/components/nacl.gyp b/components/nacl.gyp index 2c70b7d..7b3b096 100644 --- a/components/nacl.gyp +++ b/components/nacl.gyp @@ -307,8 +307,7 @@ }], ['os_posix == 1 and OS != "mac"', { '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', ], |