Revert 173550
> Linux: use generated library loader for libspeechd. > > This will require an update to build/install-build-deps.sh > (done in a separate CL as requested by the infra team). > > BUG=162733 > > Review URL: https://codereview.chromium.org/11415243 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/11573052 git-svn-id: http://src.chromium.org/svn/trunk/src/build@173561 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
1ba811a25b
Коммит
4aa952613c
|
@ -13,7 +13,6 @@
|
|||
],
|
||||
|
||||
'linux_link_libpci%': 0,
|
||||
'linux_link_libspeechd%': 0,
|
||||
},
|
||||
'conditions': [
|
||||
[ 'os_posix==1 and OS!="mac"', {
|
||||
|
@ -383,62 +382,6 @@
|
|||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'libspeechd',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'../../base/base.gyp:base',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
],
|
||||
'conditions': [
|
||||
['linux_link_libspeechd==1', {
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lspeechd',
|
||||
],
|
||||
}
|
||||
}],
|
||||
],
|
||||
},
|
||||
'hard_dependency': 1,
|
||||
'actions': [
|
||||
{
|
||||
'variables': {
|
||||
'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libspeechd.h',
|
||||
'output_cc': '<(INTERMEDIATE_DIR)/libspeechd_loader.cc',
|
||||
'generator': '../../tools/generate_library_loader/generate_library_loader.py',
|
||||
},
|
||||
'action_name': 'generate_libspeechd_loader',
|
||||
'inputs': [
|
||||
'<(generator)',
|
||||
],
|
||||
'outputs': [
|
||||
'<(output_h)',
|
||||
'<(output_cc)',
|
||||
],
|
||||
'action': ['python',
|
||||
'<(generator)',
|
||||
'--name', 'LibSpeechdLoader',
|
||||
'--output-h', '<(output_h)',
|
||||
'--output-cc', '<(output_cc)',
|
||||
'--header', '<libspeechd.h>',
|
||||
'--link-directly=<(linux_link_libspeechd)',
|
||||
'spd_open',
|
||||
'spd_say',
|
||||
'spd_stop',
|
||||
'spd_close',
|
||||
'spd_set_notification_on',
|
||||
'spd_set_voice_rate',
|
||||
'spd_set_voice_pitch',
|
||||
],
|
||||
'message': 'Generating libspeechd library loader.',
|
||||
'process_outputs_as_sources': 1,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'x11',
|
||||
'type': 'none',
|
||||
|
|
Загрузка…
Ссылка в новой задаче