diff options
| author | henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-09 13:04:12 +0000 |
|---|---|---|
| committer | henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-09 13:04:12 +0000 |
| commit | 2e4c6211119db290a283d025ce453e4e920133c1 (patch) | |
| tree | 4ffbd9d147916fea33555260e3449b177ca10905 /voice_engine/voice_engine_impl.cc | |
| parent | f03e467e6b5828c0f6bedc5070a17bef755fc98d (diff) | |
| download | webrtc-2e4c6211119db290a283d025ce453e4e920133c1.tar.gz | |
(landing) Exclude VoiceEngine::SetAndroidObjects in WebRTC chrome builds
Landing https://webrtc-codereview.appspot.com/11419004/ manually.
TBR=niklase
BUG=none
Review URL: https://webrtc-codereview.appspot.com/11439005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5872 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voice_engine_impl.cc')
| -rw-r--r-- | voice_engine/voice_engine_impl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/voice_engine/voice_engine_impl.cc b/voice_engine/voice_engine_impl.cc index 4c02d8d2..2f524bb0 100644 --- a/voice_engine/voice_engine_impl.cc +++ b/voice_engine/voice_engine_impl.cc @@ -12,9 +12,11 @@ #include "webrtc/modules/audio_device/android/audio_device_template.h" #include "webrtc/modules/audio_device/android/audio_record_jni.h" #include "webrtc/modules/audio_device/android/audio_track_jni.h" +#if !defined(WEBRTC_CHROMIUM_BUILD) #include "webrtc/modules/audio_device/android/opensles_input.h" #include "webrtc/modules/audio_device/android/opensles_output.h" #endif +#endif #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/system_wrappers/interface/trace.h" @@ -151,6 +153,7 @@ bool VoiceEngine::Delete(VoiceEngine*& voiceEngine) return true; } +#if !defined(WEBRTC_CHROMIUM_BUILD) int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context) { #ifdef WEBRTC_ANDROID @@ -171,5 +174,6 @@ int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context) return -1; #endif } +#endif } // namespace webrtc |