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

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

Issue 13355002: Implement chrome.brailleDisplayPrivate API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Style fixes and add support for two versions of libbrlapi when dlopening it. Created 7 years, 3 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
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_libgps%': 0, 15 'linux_link_libgps%': 0,
16 'linux_link_libpci%': 0, 16 'linux_link_libpci%': 0,
17 'linux_link_libspeechd%': 0, 17 'linux_link_libspeechd%': 0,
18 'linux_link_libbrlapi%': 0,
18 }, 19 },
19 'conditions': [ 20 'conditions': [
20 [ 'os_posix==1 and OS!="mac"', { 21 [ 'os_posix==1 and OS!="mac"', {
21 'variables': { 22 'variables': {
22 # We use our own copy of libssl3, although we still need to link against 23 # We use our own copy of libssl3, although we still need to link against
23 # the rest of NSS. 24 # the rest of NSS.
24 'use_system_ssl%': 0, 25 'use_system_ssl%': 0,
25 }, 26 },
26 }, { 27 }, {
27 'variables': { 28 'variables': {
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 'spd_set_synthesis_voice', 532 'spd_set_synthesis_voice',
532 'spd_list_modules', 533 'spd_list_modules',
533 'spd_set_output_module', 534 'spd_set_output_module',
534 ], 535 ],
535 'message': 'Generating libspeechd library loader.', 536 'message': 'Generating libspeechd library loader.',
536 'process_outputs_as_sources': 1, 537 'process_outputs_as_sources': 1,
537 }, 538 },
538 ], 539 ],
539 }, 540 },
540 { 541 {
542 'target_name': 'libbrlapi',
543 'type': 'static_library',
544 'dependencies': [
545 '../../base/base.gyp:base',
546 ],
547 'direct_dependent_settings': {
548 'include_dirs': [
549 '<(SHARED_INTERMEDIATE_DIR)',
550 ],
551 'conditions': [
552 ['linux_link_libbrlapi==1', {
553 'link_settings': {
554 'libraries': [
555 '-lbrlapi',
556 ],
557 }
558 }],
559 ],
560 },
561 'hard_dependency': 1,
562 'actions': [
563 {
564 'variables': {
565 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libbrlapi.h' ,
566 'output_cc': '<(INTERMEDIATE_DIR)/libbrlapi_loader.cc',
567 'generator': '../../tools/generate_library_loader/generate_library_l oader.py',
568 },
569 'action_name': 'generate_brlapi_loader',
570 'inputs': [
571 '<(generator)',
572 ],
573 'outputs': [
574 '<(output_h)',
575 '<(output_cc)',
576 ],
577 'action': ['python',
578 '<(generator)',
579 '--name', 'LibBrlApiLoader',
580 '--output-h', '<(output_h)',
581 '--output-cc', '<(output_cc)',
582 '--header', '<brlapi.h>',
583 '--link-directly=<(linux_link_libbrlapi)',
584 'brlapi_getHandleSize',
585 'brlapi_error_location',
586 'brlapi_expandKeyCode',
587 'brlapi_strerror',
588 'brlapi__acceptKeys',
589 'brlapi__openConnection',
590 'brlapi__closeConnection',
591 'brlapi__getDisplaySize',
592 'brlapi__enterTtyModeWithPath',
593 'brlapi__leaveTtyMode',
594 'brlapi__writeDots',
595 'brlapi__readKey',
596 ],
597 'message': 'Generating libbrlapi library loader.',
598 'process_outputs_as_sources': 1,
599 },
600 ],
601 },
602 {
541 'target_name': 'x11', 603 'target_name': 'x11',
542 'type': 'none', 604 'type': 'none',
543 'toolsets': ['host', 'target'], 605 'toolsets': ['host', 'target'],
544 'conditions': [ 606 'conditions': [
545 ['_toolset=="target"', { 607 ['_toolset=="target"', {
546 'direct_dependent_settings': { 608 'direct_dependent_settings': {
547 'cflags': [ 609 'cflags': [
548 '<!@(<(pkg-config) --cflags x11)', 610 '<!@(<(pkg-config) --cflags x11)',
549 ], 611 ],
550 }, 612 },
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 ], 894 ],
833 'libraries': [ 895 'libraries': [
834 '<!@(<(pkg-config) --libs-only-l libudev)', 896 '<!@(<(pkg-config) --libs-only-l libudev)',
835 ], 897 ],
836 }, 898 },
837 }], 899 }],
838 ], 900 ],
839 }, 901 },
840 ], 902 ],
841 } 903 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698