summaryrefslogtreecommitdiff
path: root/voice_engine/voice_engine_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'voice_engine/voice_engine_impl.cc')
-rw-r--r--voice_engine/voice_engine_impl.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/voice_engine/voice_engine_impl.cc b/voice_engine/voice_engine_impl.cc
index e01a2cd1..4c923ebc 100644
--- a/voice_engine/voice_engine_impl.cc
+++ b/voice_engine/voice_engine_impl.cc
@@ -8,9 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#if defined(WEBRTC_ANDROID) && !defined(WEBRTC_ANDROID_OPENSLES)
+#if defined(WEBRTC_ANDROID)
+#if defined(WEBRTC_ANDROID_OPENSLES)
+#include "webrtc/modules/audio_device/android/audio_manager_jni.h"
+#else
#include "webrtc/modules/audio_device/android/audio_device_jni_android.h"
#endif
+#endif
#include "webrtc/system_wrappers/interface/trace.h"
#include "webrtc/voice_engine/voice_engine_impl.h"
@@ -142,6 +146,7 @@ int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context)
{
#ifdef WEBRTC_ANDROID
#ifdef WEBRTC_ANDROID_OPENSLES
+ AudioManagerJni::SetAndroidAudioDeviceObjects(javaVM, env, context);
return 0;
#else
return AudioDeviceAndroidJni::SetAndroidAudioDeviceObjects(