ui/gfx/gl/gl.gyp - Issue 7467007: Adding Wayland support for ui/gfx

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: ui/gfx/gl/gl.gyp

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fixed order of includes Created 9 years, 5 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:

Index: ui/gfx/gl/gl.gyp

diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp

index 5771682e34375e928ed7f288332f3ea13626948d..abf3759d1af4f7d73bf96b524e36596831148d06 100644

--- a/ui/gfx/gl/gl.gyp

+++ b/ui/gfx/gl/gl.gyp

@@ -58,6 +58,7 @@

'gl_surface_mac.cc',

'gl_surface_stub.cc',

'gl_surface_stub.h',

+ 'gl_surface_wayland.cc',

'gl_surface_win.cc',

'gl_surface_osmesa.cc',

'gl_surface_osmesa.h',

@@ -112,11 +113,20 @@

'<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',

'<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',

- 'include_dirs': [

- '<(DEPTH)/third_party/angle/include',

+ 'conditions': [

+ ['use_wayland != 1', {

+ 'include_dirs': [

+ '<(DEPTH)/third_party/angle/include',

+ ],

+ }],

}],

- ['use_x11 == 1', {

+ ['use_wayland == 1', {

+ 'sources!': [

+ 'gl_surface_linux.cc',

+ ],

+ }],

+ ['use_x11 == 1 and use_wayland != 1', {

'sources': [

'gl_context_glx.cc',

'gl_context_glx.h',