summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_android.gypi
diff options
context:
space:
mode:
authordmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 16:05:44 +0000
committerdmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 16:05:44 +0000
commit8d24f8d8f9db0a2bf6ee056aac67a3fdc515f764 (patch)
treeb542d571cecdac399b7b9e9e53ba423a08f017c3 /chrome/chrome_android.gypi
parenta135e7fd6d142877931a69529be48a8696c4b1d8 (diff)
downloadchromium_src-8d24f8d8f9db0a2bf6ee056aac67a3fdc515f764.zip
chromium_src-8d24f8d8f9db0a2bf6ee056aac67a3fdc515f764.tar.gz
chromium_src-8d24f8d8f9db0a2bf6ee056aac67a3fdc515f764.tar.bz2
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
Diffstat (limited to 'chrome/chrome_android.gypi')
-rw-r--r--chrome/chrome_android.gypi3
1 files changed, 2 insertions, 1 deletions
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', ],
}],