From edfa7d7131a14e0c3ee6848adf0fcc6a2b8be307 Mon Sep 17 00:00:00 2001 From: Lu Liu Date: Mon, 13 Nov 2017 19:43:17 +0000 Subject: [PATCH] Revert "Move InitClassLoader from JNI_OnLoad to InitGlobalJniVariables." This reverts commit b3a8c980f7b33e7457f9a1ee3582ccbc28b7f70c. Reason for revert: Breaking internal projects Original change's description: > Move InitClassLoader from JNI_OnLoad to InitGlobalJniVariables. > > 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 > Commit-Queue: Magnus Jedvert > Cr-Commit-Position: refs/heads/master@{#20629} TBR=magjed@webrtc.org,sakal@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8278 Change-Id: I6add8182172501cb93bed998f68ce848c7280a98 Reviewed-on: https://webrtc-review.googlesource.com/22780 Reviewed-by: Lu Liu Commit-Queue: Lu Liu Cr-Commit-Position: refs/heads/master@{#20660} --- sdk/android/src/jni/jni_helpers.cc | 3 --- sdk/android/src/jni/jni_onload.cc | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk/android/src/jni/jni_helpers.cc b/sdk/android/src/jni/jni_helpers.cc index f55cd1b8e1..4c3724f44c 100644 --- a/sdk/android/src/jni/jni_helpers.cc +++ b/sdk/android/src/jni/jni_helpers.cc @@ -15,7 +15,6 @@ #include #include -#include "sdk/android/src/jni/class_loader.h" #include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { @@ -79,8 +78,6 @@ jint InitGlobalJniVariables(JavaVM *jvm) { if (jvm->GetEnv(reinterpret_cast(&jni), JNI_VERSION_1_6) != JNI_OK) return -1; - InitClassLoader(jni); - return JNI_VERSION_1_6; } diff --git a/sdk/android/src/jni/jni_onload.cc b/sdk/android/src/jni/jni_onload.cc index d70d7b850d..cb708e7fda 100644 --- a/sdk/android/src/jni/jni_onload.cc +++ b/sdk/android/src/jni/jni_onload.cc @@ -28,6 +28,8 @@ 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; }