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

Side by Side Diff: build/linux/system.gyp

Issue 11573052: Revert 173550 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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/browser/speech/extension_api/tts_extension_api_linux.cc » ('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': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
10 }, { 10 }, {
11 'pkg-config': 'pkg-config' 11 'pkg-config': 'pkg-config'
12 }] 12 }]
13 ], 13 ],
14 14
15 'linux_link_libpci%': 0, 15 'linux_link_libpci%': 0,
16 'linux_link_libspeechd%': 0,
17 }, 16 },
18 'conditions': [ 17 'conditions': [
19 [ 'os_posix==1 and OS!="mac"', { 18 [ 'os_posix==1 and OS!="mac"', {
20 'variables': { 19 'variables': {
21 # We use our own copy of libssl3, although we still need to link against 20 # We use our own copy of libssl3, although we still need to link against
22 # the rest of NSS. 21 # the rest of NSS.
23 'use_system_ssl%': 0, 22 'use_system_ssl%': 0,
24 }, 23 },
25 }, { 24 }, {
26 'variables': { 25 'variables': {
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 'pci_scan_bus', 376 'pci_scan_bus',
378 'pci_fill_info', 377 'pci_fill_info',
379 'pci_lookup_name', 378 'pci_lookup_name',
380 ], 379 ],
381 'message': 'Generating libpci library loader.', 380 'message': 'Generating libpci library loader.',
382 'process_outputs_as_sources': 1, 381 'process_outputs_as_sources': 1,
383 }, 382 },
384 ], 383 ],
385 }, 384 },
386 { 385 {
387 'target_name': 'libspeechd',
388 'type': 'static_library',
389 'dependencies': [
390 '../../base/base.gyp:base',
391 ],
392 'direct_dependent_settings': {
393 'include_dirs': [
394 '<(SHARED_INTERMEDIATE_DIR)',
395 ],
396 'conditions': [
397 ['linux_link_libspeechd==1', {
398 'link_settings': {
399 'libraries': [
400 '-lspeechd',
401 ],
402 }
403 }],
404 ],
405 },
406 'hard_dependency': 1,
407 'actions': [
408 {
409 'variables': {
410 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libspeechd.h ',
411 'output_cc': '<(INTERMEDIATE_DIR)/libspeechd_loader.cc',
412 'generator': '../../tools/generate_library_loader/generate_library_l oader.py',
413 },
414 'action_name': 'generate_libspeechd_loader',
415 'inputs': [
416 '<(generator)',
417 ],
418 'outputs': [
419 '<(output_h)',
420 '<(output_cc)',
421 ],
422 'action': ['python',
423 '<(generator)',
424 '--name', 'LibSpeechdLoader',
425 '--output-h', '<(output_h)',
426 '--output-cc', '<(output_cc)',
427 '--header', '<libspeechd.h>',
428 '--link-directly=<(linux_link_libspeechd)',
429 'spd_open',
430 'spd_say',
431 'spd_stop',
432 'spd_close',
433 'spd_set_notification_on',
434 'spd_set_voice_rate',
435 'spd_set_voice_pitch',
436 ],
437 'message': 'Generating libspeechd library loader.',
438 'process_outputs_as_sources': 1,
439 },
440 ],
441 },
442 {
443 'target_name': 'x11', 386 'target_name': 'x11',
444 'type': 'none', 387 'type': 'none',
445 'toolsets': ['host', 'target'], 388 'toolsets': ['host', 'target'],
446 'conditions': [ 389 'conditions': [
447 ['_toolset=="target"', { 390 ['_toolset=="target"', {
448 'direct_dependent_settings': { 391 'direct_dependent_settings': {
449 'cflags': [ 392 'cflags': [
450 '<!@(<(pkg-config) --cflags x11)', 393 '<!@(<(pkg-config) --cflags x11)',
451 ], 394 ],
452 }, 395 },
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 ], 746 ],
804 'libraries': [ 747 'libraries': [
805 '<!@(<(pkg-config) --libs-only-l libudev)', 748 '<!@(<(pkg-config) --libs-only-l libudev)',
806 ], 749 ],
807 }, 750 },
808 }], 751 }],
809 ], 752 ],
810 }, 753 },
811 ], 754 ],
812 } 755 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/speech/extension_api/tts_extension_api_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698