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

Unified Diff: base/base.gypi

Issue 7473010: Adding Wayland message loop and gyp build deps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updating files Created 9 years, 4 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 | « no previous file | base/message_loop.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 21ce9bf5bdcdb1cf86382ee411f98e068851a349..732097988d89c7cf53a417ab8a4e9f9b9b18d8ae 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -368,6 +368,12 @@
'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
],
'conditions': [
+ [ 'use_wayland == 1', {
+ 'sources!': [
+ 'message_pump_gtk.cc',
+ 'message_pump_x.cc',
+ ],
+ }],
[ 'toolkit_uses_gtk==0', {
'sources/': [
['exclude', '^nix/'],
@@ -581,6 +587,8 @@
'message_pump_libevent.h',
'message_pump_mac.h',
'message_pump_mac.mm',
+ 'message_pump_wayland.cc',
+ 'message_pump_wayland.h',
'metrics/field_trial.cc',
'metrics/field_trial.h',
'string16.cc',
« no previous file with comments | « no previous file | base/message_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698