ppapi/ppapi_tests.gypi - 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: ppapi/ppapi_tests.gypi

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: ppapi/ppapi_tests.gypi

diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi

index 642f4597e8bbcad4e03a1fd6a32e1595846797e0..f9447d438d5a6f7a7fa0f95eacda0b5ee99c4999 100644

--- a/ppapi/ppapi_tests.gypi

+++ b/ppapi/ppapi_tests.gypi

@@ -125,7 +125,8 @@

'conditions': [

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

@@ -202,7 +203,8 @@

'conditions': [

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

« no previous file with comments | « net/net.gyp ('k') | printing/printing.gyp » ('j') | no next file with comments »