zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of https://codereview.webrtc.org/2889183002/

Browse Source 
And also revert https://codereview.webrtc.org/2888093005/ (Chromium roll) which has a dependency on 2889183002

BUG=webrtc:7707

Review-Url: https://codereview.webrtc.org/2897423002
Cr-Commit-Position: refs/heads/master@{#18263}
This commit is contained in:
lliuu
2017-05-24 16:45:57 -07:00
committed by Commit bot
parent b8c926b141
commit 548cdce7bc
18 changed files with 67 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/sdk/android/src/jni/peerconnection_jni.cc
View File

@ -1139,7 +1139,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreateObserver)(
return (jlong)new PCOJava(jni, j_observer);
}
JOW(void, PeerConnectionFactory_nativeInitializeAndroidGlobals)
JOW(void, PeerConnectionFactory_initializeAndroidGlobals)
(JNIEnv* jni,
jclass,
jobject context,
@ -1149,7 +1149,7 @@ JOW(void, PeerConnectionFactory_nativeInitializeAndroidGlobals)
if (!factory_static_initialized) {
RTC_DCHECK(j_application_context == nullptr);
j_application_context = NewGlobalRef(jni, context);
webrtc::JVM::Initialize(GetJVM());
webrtc::JVM::Initialize(GetJVM(), context);
factory_static_initialized = true;
}
}