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

Unified Diff: content/browser/BUILD.gn

Issue 2556883002: Remove enable_web_speech flag. (Closed)
Patch Set: Merge Created 4 years 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 | « chrome/test/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index f8f08c19e94297891b13e780d418a7c7878aa8eb..6102bbed42f382f3ece7a4128f68b0f2fef7215d 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -1293,27 +1293,11 @@ source_set("browser") {
"shared_worker/worker_storage_partition.h",
"site_instance_impl.cc",
"site_instance_impl.h",
- "speech/audio_buffer.cc",
- "speech/audio_buffer.h",
- "speech/audio_encoder.cc",
- "speech/audio_encoder.h",
- "speech/chunked_byte_buffer.cc",
- "speech/chunked_byte_buffer.h",
- "speech/endpointer/endpointer.cc",
- "speech/endpointer/endpointer.h",
- "speech/endpointer/energy_endpointer.cc",
- "speech/endpointer/energy_endpointer.h",
- "speech/endpointer/energy_endpointer_params.cc",
- "speech/endpointer/energy_endpointer_params.h",
"speech/speech_recognition_dispatcher_host.cc",
"speech/speech_recognition_dispatcher_host.h",
- "speech/speech_recognition_engine.cc",
- "speech/speech_recognition_engine.h",
"speech/speech_recognition_manager_impl.cc",
"speech/speech_recognition_manager_impl.h",
"speech/speech_recognizer.h",
- "speech/speech_recognizer_impl.cc",
- "speech/speech_recognizer_impl.h",
"speech/speech_recognizer_impl_android.cc",
"speech/speech_recognizer_impl_android.h",
"ssl/ssl_client_auth_handler.cc",
@@ -1764,8 +1748,22 @@ source_set("browser") {
"media/session/audio_focus_manager.h",
"tracing/tracing_ui.cc",
"tracing/tracing_ui.h",
-
- # Android skips most, but not all, of the speech code.
+ ]
+ deps -= [ "//device/battery" ]
+ deps += [
+ "//content/public/android:jni",
+ "//media",
+ "//media/capture/content/android",
+ "//media/capture/video/android",
+ "//mojo/android:libsystem_java",
+ "//ui/android",
+ ]
+ defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
+ libs += [ "jnigraphics" ]
+ } else {
+ # Not Android.
+ sources += [
+ # Most speech code is non-Android.
"speech/audio_buffer.cc",
"speech/audio_buffer.h",
"speech/audio_encoder.cc",
@@ -1783,17 +1781,7 @@ source_set("browser") {
"speech/speech_recognizer_impl.cc",
"speech/speech_recognizer_impl.h",
]
- deps -= [ "//device/battery" ]
- deps += [
- "//content/public/android:jni",
- "//media",
- "//media/capture/content/android",
- "//media/capture/video/android",
- "//mojo/android:libsystem_java",
- "//ui/android",
- ]
- defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
- libs += [ "jnigraphics" ]
+ deps += [ "//third_party/flac" ]
}
if (is_mac) {
@@ -1937,10 +1925,6 @@ source_set("browser") {
deps += [ "//ui/compositor" ]
}
- if (enable_web_speech) {
- deps += [ "//third_party/flac" ]
- }
-
if (is_linux && use_dbus) {
deps += [ "//dbus" ]
}
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698