content/content_shell.gypi - Issue 216573003: Fix a use_allocator condition for android_use_tcmalloc in content/content_shell.gypi.

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 216573003: Fix a use_allocator condition for android_use_tcmalloc in content/content_shell.gypi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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: content/content_shell.gypi

diff --git a/content/content_shell.gypi b/content/content_shell.gypi

index 1a132fdb99e861dbed1e6ead22a7d9ff2e684cdf..d19cdc5efb64949545abfa74f2d751d5f93e9882 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -312,7 +312,7 @@

}],

# TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554

- ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))))', {

+ ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (OS=="android" and 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 | « no previous file | no next file » | no next file with comments »