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

Unified Diff: build/linux/system.gyp

Issue 244403002: do not require xscrnsaver on CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move x11 files to under chromeos==0 Created 6 years, 7 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 | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 84bfbbfda9cc42190e43a186edf9bd14590529e7..507c2a2554643a198bdf748c80f766d7e1fac1a7 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': [
{
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698