Commit fd98b611 authored by brettw@chromium.org's avatar brettw@chromium.org

Move GN speechd target to third_party.

The //build directory in GN shouldn't refer to anything outside of itself so that non-Chrome projects can copy it and re-use the build configuration. speechd relies on third_party/speech-dispatcher. This patch just moves the loader to the speech-dispatcher target, which makes more sense anyway.

TBR=grunell@chromium.org

Review URL: https://codereview.chromium.org/377403002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282138 0039d316-1c4b-4281-b951-d872f2087c98
parent 8115602f
......@@ -158,26 +158,4 @@ generate_library_loader("libpci") {
]
}
generate_library_loader("libspeechd") {
name = "LibSpeechdLoader"
output_h = "libspeechd.h"
output_cc = "libspeechd.cc"
header = "<libspeechd.h>"
bundled_header = "\"third_party/speech-dispatcher/libspeechd.h\""
functions = [
"spd_open",
"spd_say",
"spd_stop",
"spd_close",
"spd_pause",
"spd_resume",
"spd_set_notification_on",
"spd_set_voice_rate",
"spd_set_voice_pitch",
"spd_list_synthesis_voices",
"spd_set_synthesis_voice",
"spd_list_modules",
"spd_set_output_module",
]
}
# Looking for libspeechd? Use //third_party/speech-dispatcher
......@@ -862,6 +862,7 @@
},
},
{
# GN version: //third_party/speech-dispatcher
'target_name': 'libspeechd',
'type': 'static_library',
'direct_dependent_settings': {
......
......@@ -328,7 +328,7 @@ static_library("browser") {
deps += [ "//device/media_transfer_protocol" ]
}
if (is_linux && !is_chromeos) {
deps += [ "//build/config/linux:libspeechd" ]
deps += [ "//third_party/speech-dispatcher" ]
}
if (is_chromeos) {
......
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//tools/generate_library_loader/generate_library_loader.gni")
generate_library_loader("speech-dispatcher") {
name = "LibSpeechdLoader"
output_h = "libspeechd.h"
output_cc = "libspeechd.cc"
header = "<libspeechd.h>"
bundled_header = "\"third_party/speech-dispatcher/libspeechd.h\""
functions = [
"spd_open",
"spd_say",
"spd_stop",
"spd_close",
"spd_pause",
"spd_resume",
"spd_set_notification_on",
"spd_set_voice_rate",
"spd_set_voice_pitch",
"spd_list_synthesis_voices",
"spd_set_synthesis_voice",
"spd_list_modules",
"spd_set_output_module",
]
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment