Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: build/common.gypi

Issue 14321006: Adds TCMalloc support for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dai's comments Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9767abb8ed01c3d009e3fcd9bb5ba760c512d1a7..0a515d79e5eba4773847ca98ec3b88652c538207 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -941,6 +941,7 @@
# Enable TCMalloc.
'linux_use_tcmalloc%': 1,
+ 'android_use_tcmalloc%': 0,
# Disable TCMalloc's heapchecker.
'linux_use_heapchecker%': 0,
@@ -3232,7 +3233,7 @@
'variables': {'linux_use_tcmalloc%': 1},
'defines': ['USE_HEAPCHECKER'],
}],
- ['linux_use_tcmalloc==0', {
+ ['linux_use_tcmalloc==0 and android_use_tcmalloc==0', {
'defines': ['NO_TCMALLOC'],
}],
['linux_keep_shadow_stacks==1', {

Powered by Google App Engine
This is Rietveld 408576698