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

Unified Diff: content/content_browser.gypi

Issue 356963003: Introduce enable_web_speech to replace with input_speech (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build error Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 50a14a9931207b7a82c2c1ee673c1717d4712012..1ab1671ca95e28a9ae63deea18997e211e394dfb 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1726,11 +1726,6 @@
['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'],
['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'],
- ['exclude', '^browser/speech/'],
- ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h)$'],
- ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'],
- ['include', '^browser/speech/speech_recognizer\\.h$'],
- ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'],
],
'sources': [
'<@(android_browser_sources)',
@@ -1811,12 +1806,21 @@
'<@(plugin_browser_sources)',
],
}],
- ['input_speech==1', {
+ ['enable_web_speech==1', {
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
'../third_party/speex/speex.gyp:libspeex',
],
}],
+ ['enable_web_speech==0 and OS=="android"', {
+ 'sources/': [
+ ['exclude', '^browser/speech/'],
+ ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h)$'],
+ ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'],
+ ['include', '^browser/speech/speech_recognizer\\.h$'],
+ ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'],
+ ],
+ }],
['OS == "win"', {
'sources!': [
'browser/geolocation/empty_wifi_data_provider.cc',
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698