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

Unified Diff: base/base.gypi

Issue 8508039: Do not build message_pump_x.cc when use_wayland (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix per feedback. Created 9 years, 1 month 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 | no next file » | 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 6e7d88d0e3f77b7d84fd2f7c3ed6822e7fc199c0..bc46a45e6a3a256d9023456fba66204dcd469d79 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -408,12 +408,6 @@
'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
],
'conditions': [
- [ 'use_wayland == 1', {
- 'sources!': [
- 'message_pump_gtk.cc',
- 'message_pump_x.cc',
- ],
- }],
[ 'use_glib==0', {
'sources/': [
['exclude', '^nix/'],
@@ -431,7 +425,13 @@
'sources!' : [ 'message_pump_x.cc', ],
}, {
'sources!' : [ 'message_pump_gtk.cc', ],
- 'sources/' : [ [ 'include', 'message_pump_x.cc', ] ],
+ 'sources/' : [ [ 'include', '^message_pump_x\\.cc$', ] ],
+ }],
+ [ 'use_wayland==1', {
+ 'sources/': [
+ [ 'exclude', '^message_pump_gtk\\.cc$',],
+ [ 'exclude', '^message_pump_x\\.cc$',],
+ ],
}],
[ 'OS != "linux" and OS != "openbsd"', {
'sources!': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698