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

Unified Diff: build/common.gypi

Issue 7473010: Adding Wayland message loop and gyp build deps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 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
« base/message_pump_wayland.h ('K') | « build/all.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 3cf06064c60fb8a93739115e3f9e879136ac2127..811597def6f44017134436add62d4719c6e5c881 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -40,6 +40,9 @@
# Whether the compositor is enabled on views.
'views_compositor%': 0,
+
+ # Whether to build for Wayland display server
+ 'use_wayland%': 0,
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
@@ -47,6 +50,7 @@
'touchui%': '<(touchui)',
'webui_certificate_viewer%': '<(webui_certificate_viewer)',
'views_compositor%': '<(views_compositor)',
+ 'use_wayland%': '<(use_wayland)',
Evan Martin 2011/07/21 16:44:21 I believe all of these nested use_foobars are not
# Compute the architecture that we're building on.
'conditions': [
@@ -90,6 +94,7 @@
'toolkit_views%': '<(toolkit_views)',
'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
'views_compositor%': '<(views_compositor)',
+ 'use_wayland%': '<(use_wayland)',
# We used to provide a variable for changing how libraries were built.
# This variable remains until we can clean up all the users.
@@ -211,6 +216,9 @@
'toolkit_uses_gtk%': 0,
'use_x11%': 0,
}, {
+ # TODO Wayland build should have these disabled, but currently
+ # GTK and X is too spread and it's hard to completely remove
+ # every dependency.
Evan Martin 2011/07/21 16:44:21 Can you elaborate on this comment? I don't know w
'toolkit_uses_gtk%': 1,
'use_x11%': 1,
}],
@@ -291,6 +299,7 @@
'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
+ 'use_wayland%': '<(use_wayland)',
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
@@ -725,6 +734,9 @@
['touchui==1', {
'defines': ['TOUCH_UI=1'],
}],
+ ['use_wayland==1', {
+ 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
+ }],
['file_manager_extension==1', {
'defines': ['FILE_MANAGER_EXTENSION=1'],
}],
« base/message_pump_wayland.h ('K') | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698