From 1d53f64b0f42a32edff175004af3afd132bb1a8d Mon Sep 17 00:00:00 2001 From: "glaznev@webrtc.org" Date: Thu, 11 Sep 2014 16:58:25 +0000 Subject: [PATCH] Disabling initializeAndroidGlobals when built with WEBRTC_CHROMIUM_BUILD. webrtc::VideoEngine::SetAndroidObjects and webrtc::VoiceEngine::SetAndroidObjects are not compatible with WEBRTC_CHROMIUM_BUILD. Since neither VoiceEngine nor VideoEngine are needed at the time it's better to disable it completely. BUG=https://crbug.com/412276 R=glaznev@webrtc.org Review URL: https://webrtc-codereview.appspot.com/24509004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7155 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/java/jni/peerconnection_jni.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index f55948ad5..bfb5564ec 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -2400,7 +2400,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreateObserver)( return (jlong)new PCOJava(jni, j_observer); } -#ifdef ANDROID +#if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) JOW(jboolean, PeerConnectionFactory_initializeAndroidGlobals)( JNIEnv* jni, jclass, jobject context, jboolean initialize_audio, jboolean initialize_video) { @@ -2412,7 +2412,7 @@ JOW(jboolean, PeerConnectionFactory_initializeAndroidGlobals)( failure |= webrtc::VoiceEngine::SetAndroidObjects(g_jvm, jni, context); return !failure; } -#endif // ANDROID +#endif // defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) // Helper struct for working around the fact that CreatePeerConnectionFactory() // comes in two flavors: either entirely automagical (constructing its own