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

Unified Diff: build/common.gypi

Issue 14321006: Adds TCMalloc support for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Peter'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 2433392a2c1287d5fcad8be7820151add9448d8f..7fba9db843f9aca24c4ea967d5c8536d91f3586d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -960,6 +960,7 @@
# Enable TCMalloc.
'linux_use_tcmalloc%': 1,
+ 'android_use_tcmalloc%': 0,
# Disable TCMalloc's heapchecker.
'linux_use_heapchecker%': 0,
@@ -3251,7 +3252,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', {
« no previous file with comments | « build/build_config.h ('k') | content/content_shell.gypi » ('j') | content/content_shell.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698