diff options
| author | vapier@chromium.org <vapier@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 19:23:39 +0000 |
|---|---|---|
| committer | vapier@chromium.org <vapier@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 19:23:39 +0000 |
| commit | 74bf86ea04648ce6a352b3f01ebd5fc338657156 (patch) | |
| tree | 0afb5761a29bcbf79ba332b0b9f0c349ffb9ea48 /build/linux | |
| parent | b2ad22b896e93fd325d9311d6a45518565458302 (diff) | |
| download | chromium_src-74bf86ea04648ce6a352b3f01ebd5fc338657156.zip chromium_src-74bf86ea04648ce6a352b3f01ebd5fc338657156.tar.gz chromium_src-74bf86ea04648ce6a352b3f01ebd5fc338657156.tar.bz2 | |
do not require xscrnsaver on CrOS
We don't use this library in CrOS builds, so do not require it.
BUG=chromium:221522
TEST=`cbuildbot amd64-generic-tot-chrome-pfq-informational` works
Review URL: https://codereview.chromium.org/244403002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 6a7cae0..ee2e42f1 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -306,23 +306,6 @@ }, }, { - 'target_name': 'xscrnsaver', - 'type': 'none', - 'direct_dependent_settings': { - 'cflags': [ - '<!@(<(pkg-config) --cflags xscrnsaver)', - ], - }, - 'link_settings': { - 'ldflags': [ - '<!@(<(pkg-config) --libs-only-L --libs-only-other xscrnsaver)', - ], - 'libraries': [ - '<!@(<(pkg-config) --libs-only-l xscrnsaver)', - ], - }, - }, - { 'target_name': 'xtst', 'type': 'none', 'toolsets': ['host', 'target'], @@ -360,6 +343,27 @@ } ], # targets }], + ['use_x11==1 and chromeos==0', { + 'targets': [ + { + 'target_name': 'xscrnsaver', + 'type': 'none', + 'direct_dependent_settings': { + 'cflags': [ + '<!@(<(pkg-config) --cflags xscrnsaver)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other xscrnsaver)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l xscrnsaver)', + ], + }, + }, + ], # targets + }], ['use_evdev_gestures==1', { 'targets': [ { |