net/net.gyp - Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator.

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: net/net.gyp

Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 6 years, 10 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: net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp

index 13fd7390169f2df10dc9161c5480ed397d6f8eff..a9413f763da51be4b082ecdcb7931816de450dc0 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -2201,7 +2201,8 @@

[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {

'conditions': [

- ['linux_use_tcmalloc==1', {

+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554

+ ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {

'dependencies': [

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

@@ -2549,7 +2550,8 @@

}],

['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {