generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disabling initializeAndroidGlobals when built with WEBRTC_CHROMIUM_BUILD.

Browse Source 
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
This commit is contained in:
glaznev@webrtc.org 2014-09-11 16:58:25 +00:00
parent b9906743da
commit 1d53f64b0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -2400,7 +2400,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreateObserver)(
return (jlong)new PCOJava(jni, j_observer); return (jlong)new PCOJava(jni, j_observer);
} }
#ifdef ANDROID #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
JOW(jboolean, PeerConnectionFactory_initializeAndroidGlobals)( JOW(jboolean, PeerConnectionFactory_initializeAndroidGlobals)(
JNIEnv* jni, jclass, jobject context, JNIEnv* jni, jclass, jobject context,
jboolean initialize_audio, jboolean initialize_video) { jboolean initialize_audio, jboolean initialize_video) {
@ -2412,7 +2412,7 @@ JOW(jboolean, PeerConnectionFactory_initializeAndroidGlobals)(
failure |= webrtc::VoiceEngine::SetAndroidObjects(g_jvm, jni, context); failure |= webrtc::VoiceEngine::SetAndroidObjects(g_jvm, jni, context);
return !failure; return !failure;
} }
#endif // ANDROID #endif // defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
// Helper struct for working around the fact that CreatePeerConnectionFactory() // Helper struct for working around the fact that CreatePeerConnectionFactory()
// comes in two flavors: either entirely automagical (constructing its own // comes in two flavors: either entirely automagical (constructing its own