diff options
| author | msb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 23:22:08 +0000 |
|---|---|---|
| committer | msb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 23:22:08 +0000 |
| commit | a1ab03ee524106bbb0ffbbbe19fe9d1c7c5a8dee (patch) | |
| tree | 9e1e11c75cd70fad6bcf503e6366ad54425fb472 /base | |
| parent | 7b0ead976f68da996c97a832f9315105d20d393d (diff) | |
| download | chromium_src-a1ab03ee524106bbb0ffbbbe19fe9d1c7c5a8dee.zip chromium_src-a1ab03ee524106bbb0ffbbbe19fe9d1c7c5a8dee.tar.gz chromium_src-a1ab03ee524106bbb0ffbbbe19fe9d1c7c5a8dee.tar.bz2 | |
Do not build message_pump_x.cc when use_wayland
Change-Id: If343fbc83fdb0d0720bd7292e1db6e81188404b1
R=dnicoara@chromium.org,sadrul@chromium.org,tfarina@chromium.org
BUG=chromium:102903
TEST=compiles
Review URL: http://codereview.chromium.org/8508039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/base/base.gypi b/base/base.gypi index c8a21e9..9224fa9 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -411,12 +411,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/'], @@ -434,7 +428,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!': [ |