| Index: webrtc/voice_engine/voice_engine_impl.cc
|
| diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc
|
| index 5b92d27313bad3546e6d48c99520031e56325dcf..ab2dc65e5bf8b531cbf5e939809cf38a27e8c0b3 100644
|
| --- a/webrtc/voice_engine/voice_engine_impl.cc
|
| +++ b/webrtc/voice_engine/voice_engine_impl.cc
|
| @@ -12,7 +12,6 @@
|
| #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"
|
| -#include "webrtc/modules/utility/include/jvm_android.h"
|
| #endif
|
|
|
| #include "webrtc/base/checks.h"
|
| @@ -129,19 +128,6 @@ bool VoiceEngine::Delete(VoiceEngine*& voiceEngine) {
|
| return true;
|
| }
|
|
|
| -#if !defined(WEBRTC_CHROMIUM_BUILD)
|
| -// TODO(henrika): change types to JavaVM* and jobject instead of void*.
|
| -int VoiceEngine::SetAndroidObjects(void* javaVM, void* context) {
|
| -#ifdef WEBRTC_ANDROID
|
| - webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM),
|
| - reinterpret_cast<jobject>(context));
|
| - return 0;
|
| -#else
|
| - return -1;
|
| -#endif
|
| -}
|
| -#endif
|
| -
|
| std::string VoiceEngine::GetVersionString() {
|
| std::string version = "VoiceEngine 4.1.0";
|
| #ifdef WEBRTC_EXTERNAL_TRANSPORT
|
|
|