gpu/gles2_conform_support/gles2_conform_support.gyp - Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files.

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 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT Created 6 years, 8 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 b2ebe14467477a685db4ba1245f821b8a52d0cbf..d34996e7f8d178b96cbe8fdf52c28d806518f868 100644

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

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

@@ -83,11 +83,6 @@

'egl_native',

'../../third_party/khronos/khronos.gyp:khronos_headers',

- 'conditions': [

- ['toolkit_uses_gtk == 1', {

- 'dependencies': ['../../build/linux/system.gyp:gtk'],

- }],

- ],

'sources': [

'native/main.cc',

'native/egl_native.cc',

@@ -111,9 +106,6 @@

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

'conditions': [

- ['toolkit_uses_gtk == 1', {

- 'dependencies': ['../../build/linux/system.gyp:gtk'],

- }],

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

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

« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | ipc/ipc.gyp » ('j') | no next file with comments »