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

Side by Side 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, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)"', 9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)"',
10 # libgcrypt-config-wrapper invokes libgcrypt-config directly from the 10 # libgcrypt-config-wrapper invokes libgcrypt-config directly from the
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 'link_settings': { 299 'link_settings': {
300 'ldflags': [ 300 'ldflags': [
301 '<!@(<(pkg-config) --libs-only-L --libs-only-other xrender)', 301 '<!@(<(pkg-config) --libs-only-L --libs-only-other xrender)',
302 ], 302 ],
303 'libraries': [ 303 'libraries': [
304 '<!@(<(pkg-config) --libs-only-l xrender)', 304 '<!@(<(pkg-config) --libs-only-l xrender)',
305 ], 305 ],
306 }, 306 },
307 }, 307 },
308 { 308 {
309 'target_name': 'xscrnsaver',
310 'type': 'none',
311 'direct_dependent_settings': {
312 'cflags': [
313 '<!@(<(pkg-config) --cflags xscrnsaver)',
314 ],
315 },
316 'link_settings': {
317 'ldflags': [
318 '<!@(<(pkg-config) --libs-only-L --libs-only-other xscrnsaver)',
319 ],
320 'libraries': [
321 '<!@(<(pkg-config) --libs-only-l xscrnsaver)',
322 ],
323 },
324 },
325 {
326 'target_name': 'xtst', 309 'target_name': 'xtst',
327 'type': 'none', 310 'type': 'none',
328 'toolsets': ['host', 'target'], 311 'toolsets': ['host', 'target'],
329 'conditions': [ 312 'conditions': [
330 ['_toolset=="target"', { 313 ['_toolset=="target"', {
331 'direct_dependent_settings': { 314 'direct_dependent_settings': {
332 'cflags': [ 315 'cflags': [
333 '<!@(<(pkg-config) --cflags xtst)', 316 '<!@(<(pkg-config) --cflags xtst)',
334 ], 317 ],
335 }, 318 },
(...skipping 17 matching lines...) Expand all
353 ], 336 ],
354 'libraries': [ 337 'libraries': [
355 '<!@(pkg-config --libs-only-l xtst)', 338 '<!@(pkg-config --libs-only-l xtst)',
356 ], 339 ],
357 }, 340 },
358 }] 341 }]
359 ] 342 ]
360 } 343 }
361 ], # targets 344 ], # targets
362 }], 345 }],
346 ['use_x11==1 and chromeos==0', {
347 'targets': [
348 {
349 'target_name': 'xscrnsaver',
350 'type': 'none',
351 'direct_dependent_settings': {
352 'cflags': [
353 '<!@(<(pkg-config) --cflags xscrnsaver)',
354 ],
355 },
356 'link_settings': {
357 'ldflags': [
358 '<!@(<(pkg-config) --libs-only-L --libs-only-other xscrnsaver)',
359 ],
360 'libraries': [
361 '<!@(<(pkg-config) --libs-only-l xscrnsaver)',
362 ],
363 },
364 },
365 ], # targets
366 }],
363 ['use_evdev_gestures==1', { 367 ['use_evdev_gestures==1', {
364 'targets': [ 368 'targets': [
365 { 369 {
366 'target_name': 'libevdev-cros', 370 'target_name': 'libevdev-cros',
367 'type': 'none', 371 'type': 'none',
368 'direct_dependent_settings': { 372 'direct_dependent_settings': {
369 'cflags': [ 373 'cflags': [
370 '<!@(<(pkg-config) --cflags libevdev-cros)' 374 '<!@(<(pkg-config) --cflags libevdev-cros)'
371 ], 375 ],
372 }, 376 },
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 ], 1048 ],
1045 'libraries': [ 1049 'libraries': [
1046 '<!@(<(pkg-config) --libs-only-l libudev)', 1050 '<!@(<(pkg-config) --libs-only-l libudev)',
1047 ], 1051 ],
1048 }, 1052 },
1049 }], 1053 }],
1050 ], 1054 ],
1051 }, 1055 },
1052 ], 1056 ],
1053 } 1057 }
OLDNEW
« 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