Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: ui/gfx/surface/surface.gyp

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Replaced the way WaylandDisplay is being retrieved 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:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/surface/surface.gyp
diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp
index 17f372cdeddb1bec760f29a4c0dda0f3d088e3f0..c74c1880845dccda51130f7aef1c7e3160214ab6 100644
--- a/ui/gfx/surface/surface.gyp
+++ b/ui/gfx/surface/surface.gyp
@@ -9,11 +9,20 @@
'target_defaults': {
'conditions': [
- ['toolkit_uses_gtk == 1', {
+ ['toolkit_uses_gtk == 1 and use_wayland != 1', {
'include_dirs': [
'<(DEPTH)/third_party/angle/include',
],
}],
+ ['use_wayland == 1', {
+ 'sources/': [
+ ['exclude', '_(linux)\\.cc$'],
+ ],
+ }, {
+ 'sources/': [
+ ['exclude', '_(wayland)\\.cc$'],
+ ],
+ }],
],
},
'targets': [
@@ -31,6 +40,8 @@
'accelerated_surface_linux.h',
'accelerated_surface_mac.cc',
'accelerated_surface_mac.h',
+ 'accelerated_surface_wayland.cc',
+ 'accelerated_surface_wayland.h',
'io_surface_support_mac.cc',
'io_surface_support_mac.h',
'transport_dib.h',
@@ -38,6 +49,13 @@
'transport_dib_mac.cc',
'transport_dib_win.cc',
],
+ 'conditions': [
+ ['use_wayland == 1', {
+ 'sources/': [
+ ['include', 'transport_dib_linux.cc'],
jonathan.backer 2011/07/26 14:56:27 why is it necessary to explicitly include this. do
+ ],
+ }],
+ ],
},
],
}

Powered by Google App Engine
This is Rietveld 408576698