gpu/gles2_conform_support/gles2_conform_support.gyp - Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets

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

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 11 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: gpu/gles2_conform_support/gles2_conform_support.gyp

diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp

index 6e63493586a41e2f290eeccb8459d3e5e409a754..f585d92e7d644c451b3c8ea924724d29208cdcf6 100644

--- a/gpu/gles2_conform_support/gles2_conform_support.gyp

+++ b/gpu/gles2_conform_support/gles2_conform_support.gyp

@@ -96,18 +96,11 @@

'type': 'executable',

'dependencies': [

'egl_native',

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

'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

'../../gpu/gpu.gyp:gles2_c_lib_nocheck',

'../../third_party/expat/expat.gyp:expat',

- 'conditions': [

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

- ['OS=="linux" and use_allocator!="none"', {

- 'dependencies': [

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

- ],

- }],

- ],

'defines': [

'GLES2_CONFORM_SUPPORT_ONLY',

'GTF_GLES20',

« no previous file with comments | « gpu/gles2_conform_support/BUILD.gn ('k') | gpu/gpu.gyp » ('j') | third_party/WebKit/Source/platform/blink_platform_tests.gyp » ('J')