content/content_shell.gypi - Issue 14321006: Adds TCMalloc support for Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebased 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:

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',