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

Unified Diff: content/content_shell.gypi

Issue 14321006: Adds TCMalloc support for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always use phtread_once 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
« no previous file with comments | « build/common.gypi ('k') | third_party/tcmalloc/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index fd04f5225968e4427336a725fe82a75f2f58ef0c..122e56baf8fa547b7a832ec3a09642d6f68d3056 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -194,7 +194,7 @@
'../webkit/support/webkit_support.gyp:webkit_support',
],
}], # OS=="android"
- ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', {
+ ['(os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (android_use_tcmalloc==1)', {
'dependencies': [
# This is needed by content/app/content_main_runner.cc
'../base/allocator/allocator.gyp:allocator',
« no previous file with comments | « build/common.gypi ('k') | third_party/tcmalloc/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698