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

diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp

index ec679d1a4c34eaabfb2aaae94e253bf61a955b3a..100cfbafe139cf28ca5c8c235e43c8f3598be576 100644

--- a/cc/cc_tests.gyp

+++ b/cc/cc_tests.gyp

@@ -257,7 +257,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',

@@ -314,7 +315,8 @@

}

# See http://crbug.com/162998#c4 for why this is needed.

- ['OS=="linux" and linux_use_tcmalloc==1',

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

+ ['OS=="linux" and ((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',

« no previous file with comments | « build/gyp_chromium ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »