content/content_browser.gypi - Issue 15907012: Implement SpeechRecognizerImplAndroid

Unified Diff: content/content_browser.gypi

Issue 15907012: Implement SpeechRecognizerImplAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix non-android builds by excluding speech_recognizer_impl_android Created 7 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

« content/browser/speech/speech_recognizer_impl_android.cc ('K') | « content/content.gyp ('k') | content/content_jni.gypi » ('j') | content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index eb8843c07e46b73de7cba2b6b5917e52c51ff622..cfb5168e24fb0b72deb50b4411142e441c156e6b 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -967,6 +967,8 @@

'browser/speech/speech_recognizer.h',

'browser/speech/speech_recognizer_impl.cc',

'browser/speech/speech_recognizer_impl.h',

+ 'browser/speech/speech_recognizer_impl_android.cc',

+ 'browser/speech/speech_recognizer_impl_android.h',

'browser/ssl/ssl_cert_error_handler.cc',

'browser/ssl/ssl_cert_error_handler.h',

'browser/ssl/ssl_client_auth_handler.cc',

@@ -1290,9 +1292,15 @@

['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_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!="android"

+ 'sources!': [

+ 'browser/speech/speech_recognizer_impl_android.h',

+ 'browser/speech/speech_recognizer_impl_android.cc',

Peter Beverloo 2013/06/13 11:46:23 These should be excluded through a global _android

janx 2013/06/13 16:08:53 I can't see any global _android exclusion rule; if

}],

['OS=="mac"', {

@@ -1419,7 +1427,7 @@

}],

['input_speech==0', {

'sources/': [

- ['exclude', '^browser/speech/input_tag_speech_dispatcher_host'],

+ ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$'],

}, { # input_speech==1

'dependencies': [