summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 15:09:32 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 15:09:32 +0000
commit3313359d46d2a4f0e0dc8c4dc476462dec8c988a (patch)
tree8b36d0a648937a3c0cc1b08a22f9a34c43451149
parent638547e2535b060d887a1f9aa8cad7f2a088de99 (diff)
downloadchromium_src-3313359d46d2a4f0e0dc8c4dc476462dec8c988a.zip
chromium_src-3313359d46d2a4f0e0dc8c4dc476462dec8c988a.tar.gz
chromium_src-3313359d46d2a4f0e0dc8c4dc476462dec8c988a.tar.bz2
Makes it so that os_exchange_data_gtk is only compiled if views is
defined. BUG=none TEST=none Review URL: http://codereview.chromium.org/115340 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16055 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome.gyp10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 515c99e..c741b22 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -241,10 +241,12 @@
'../app/os_exchange_data.cc',
],
'conditions': [
- ['toolkit_views!="1"', {
- 'sources!': [
- '../app/os_exchange_data.h',
- '../app/os_exchange_data_gtk.cc',
+ ['toolkit_views==0', {
+ # Note: because of gyp predence rules this has to be defined as
+ # 'sources/' rather than 'sources!'.
+ 'sources/': [
+ ['exclude', '^../app/os_exchange_data_gtk.cc'],
+ ['exclude', '^../app/os_exchange_data.h'],
],
}],
],