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: Created 7 years, 8 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 b245dd3966506557a713efe3d05f4020dccac370..feeac35c44bb3eed97ab09277c836b453ae5242f 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -187,7 +187,13 @@

'dependencies': [

'content_shell_jni_headers',

- }, { # else: OS!="android"

+ }],

+ ['OS=="android" and android_use_tcmalloc==1', {

+ 'dependencies': [

+ '../base/allocator/allocator.gyp:allocator',

+ ],

+ }],

+ ['OS!="android"', {

Peter Beverloo 2013/04/29 17:03:31 Why don't you add the block on 191-195 below line

bulach 2013/04/30 18:43:08 Done.

'dependencies': [

# This dependency is for running DRT against the content shell, and

# this combination is not yet supported on Android.