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

Unified Diff: build/common.gypi

Issue 17265006: wayland patch for inspection Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « base/wayland/wayland_event.h ('k') | build/filename_rules.gypi » ('j') | 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 094b7e216d4a814b56c15473bae6d9360c9a9a75..445bd6849b26c5a0020e89bf09c33c893d44c981 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -29,12 +29,16 @@
# Use a raw surface abstraction.
'use_ozone%': 0,
+
+ # Use Wayland system
+ 'use_wayland%': 0,
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_ozone%': '<(use_ozone)',
+ 'use_wayland%': '<(use_wayland)',
# Whether we are using Views Toolkit
'toolkit_views%': 0,
@@ -99,6 +103,7 @@
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_ozone%': '<(use_ozone)',
+ 'use_wayland%': '<(use_wayland)',
'use_openssl%': '<(use_openssl)',
'enable_viewport%': '<(enable_viewport)',
'enable_hidpi%': '<(enable_hidpi)',
@@ -132,7 +137,7 @@
}],
# Set toolkit_uses_gtk for the Chromium browser on Linux.
- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_ozone==0', {
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_ozone==0 and use_wayland==0', {
'toolkit_uses_gtk%': 1,
}, {
'toolkit_uses_gtk%': 0,
@@ -180,6 +185,7 @@
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_ozone%': '<(use_ozone)',
+ 'use_wayland%': '<(use_wayland)',
'use_openssl%': '<(use_openssl)',
'enable_viewport%': '<(enable_viewport)',
'enable_hidpi%': '<(enable_hidpi)',
@@ -448,7 +454,7 @@
}],
# Flags to use X11 on non-Mac POSIX platforms.
- ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', {
+ ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1 or use_wayland==1', {
'use_x11%': 0,
}, {
'use_x11%': 1,
@@ -748,6 +754,7 @@
'use_glib%': '<(use_glib)',
'use_pango%': '<(use_pango)',
'use_ozone%': '<(use_ozone)',
+ 'use_wayland%': '<(use_wayland)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_x11%': '<(use_x11)',
'use_gnome_keyring%': '<(use_gnome_keyring)',
@@ -1496,6 +1503,9 @@
['use_ozone==1', {
'grit_defines': ['-D', 'use_ozone'],
}],
+ ['use_wayland==1', {
+ 'grit_defines': ['-D', 'use_wayland'],
+ }],
['file_manager_extension==1', {
'grit_defines': ['-D', 'file_manager_extension'],
}],
@@ -1900,6 +1910,9 @@
['use_ozone==1', {
'defines': ['USE_OZONE=1'],
}],
+ ['use_wayland==1', {
+ 'defines': ['USE_WAYLAND=1'],
+ }],
['use_default_render_theme==1', {
'defines': ['USE_DEFAULT_RENDER_THEME=1'],
}],
« no previous file with comments | « base/wayland/wayland_event.h ('k') | build/filename_rules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698