diff options
| author | janx@chromium.org <janx@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 20:07:49 +0000 |
|---|---|---|
| committer | janx@chromium.org <janx@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 20:07:49 +0000 |
| commit | 3bd0aabf77663803587a8496ff44b7df8d795697 (patch) | |
| tree | 6cad54305b290f14e2dc0fd6a6927244cac2b78c /content/content_browser.gypi | |
| parent | a25864446a293a803a25bf5dd7ac036c299f732c (diff) | |
| download | chromium_src-3bd0aabf77663803587a8496ff44b7df8d795697.zip chromium_src-3bd0aabf77663803587a8496ff44b7df8d795697.tar.gz chromium_src-3bd0aabf77663803587a8496ff44b7df8d795697.tar.bz2 | |
Transition Web Speech Recognition from compile-time to run-time flag
This changes the purpose of the "ENABLE_INPUT_SPEECH" compile-time flag to
guard only the x-webkit-speech API instead of all speech recognition code.
The code shared between x-webkit-speech and the Web Speech API will now be
compiled on Android, allowing the implementation of Web Speech Recognition.
The latter is already guarded by the "enableScriptedSpeech" Blink run-time
flag, which is active on every platform except Android, unless the command-
line flag "--enable-speech-recognition" is specified.
BUG=244422
Review URL: https://chromiumcodereview.appspot.com/15649004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browser.gypi')
| -rw-r--r-- | content/content_browser.gypi | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index b7a2430..d7b81c0 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1218,13 +1218,14 @@ '-ljnigraphics', ], }, - 'sources!': [ - 'browser/geolocation/network_location_provider.cc', - 'browser/geolocation/network_location_provider.h', - 'browser/geolocation/network_location_request.cc', - 'browser/geolocation/network_location_request.h', - 'browser/tracing/tracing_ui.cc', - 'browser/tracing/tracing_ui.h', + 'sources/': [ + ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'], + ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'], + ['exclude', '^browser/tracing/tracing_ui'], + ['exclude', '^browser/speech/'], + ['include', '^browser/speech/speech_recognition_dispatcher_host'], + ['include', '^browser/speech/speech_recognition_manager_impl'], + ['include', '^browser/speech/speech_recognizer\\.h$'], ], }], ['OS=="mac"', { @@ -1351,7 +1352,7 @@ }], ['input_speech==0', { 'sources/': [ - ['exclude', '^browser/speech/'], + ['exclude', '^browser/speech/input_tag_speech_dispatcher_host'], ], }, { # input_speech==1 'dependencies': [ |