mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-14 06:10:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move InitClassLoader from JNI_OnLoad to InitGlobalJniVariables.

Browse source 
This fixes clients with custom JNI_OnLoad code.

Bug: webrtc:8278
Change-Id: I67b45c2ca07b13b0bf968c5ac17ec6f1bcc58a86
Reviewed-on: https://webrtc-review.googlesource.com/21281
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20629}
This commit is contained in:
Sami Kalliomäki 2017-11-09 15:35:02 +01:00 committed by Commit Bot
parent c241af9cca
commit b3a8c980f7
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sdk/android/src/jni/jni_helpers.cc
View file

@ -15,6 +15,7 @@
#include <unistd.h>
#include <vector>
#include "sdk/android/src/jni/class_loader.h"
#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
@ -78,6 +79,8 @@ jint InitGlobalJniVariables(JavaVM *jvm) {
if (jvm->GetEnv(reinterpret_cast<void**>(&jni), JNI_VERSION_1_6) != JNI_OK)
return -1;
InitClassLoader(jni);
return JNI_VERSION_1_6;
}

2
sdk/android/src/jni/jni_onload.cc
View file

@ -28,8 +28,6 @@ extern "C" jint JNIEXPORT JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()";
LoadGlobalClassReferenceHolder();
JNIEnv* env = AttachCurrentThreadIfNeeded();
InitClassLoader(env);
return ret;
}