summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlambroslambrou <lambroslambrou@chromium.org>2015-03-05 12:31:33 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-05 20:32:45 +0000
commit140a83870ee2e03537ad02b3fb490eea50e8cb17 (patch)
tree477f003b2a81ec12df095f5421d1cb95ebd015d4
parentff1c5bb37546c49a8540a927d5c44f042cb50820 (diff)
downloadchromium_src-140a83870ee2e03537ad02b3fb490eea50e8cb17.zip
chromium_src-140a83870ee2e03537ad02b3fb490eea50e8cb17.tar.gz
chromium_src-140a83870ee2e03537ad02b3fb490eea50e8cb17.tar.bz2
Android Chromoting: Fix ClassNotFoundException in native->Java calls.
This applies the same fix as the one for cronet: https://crrev.com/3b8f568c535855a63cb585d606a7e970f8820c58 BUG=463947 Review URL: https://codereview.chromium.org/967183004 Cr-Commit-Position: refs/heads/master@{#319316}
-rw-r--r--remoting/client/jni/chromoting_jni_onload.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/remoting/client/jni/chromoting_jni_onload.cc b/remoting/client/jni/chromoting_jni_onload.cc
index e82b757..fa5539e 100644
--- a/remoting/client/jni/chromoting_jni_onload.cc
+++ b/remoting/client/jni/chromoting_jni_onload.cc
@@ -5,6 +5,7 @@
#include "base/android/base_jni_registrar.h"
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
+#include "base/android/jni_utils.h"
#include "net/android/net_jni_registrar.h"
#include "remoting/client/jni/chromoting_jni_runtime.h"
#include "ui/gfx/android/gfx_jni_registrar.h"
@@ -26,6 +27,9 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
return -1;
}
+ base::android::InitReplacementClassLoader(env,
+ base::android::GetClassLoader(env));
+
return JNI_VERSION_1_4;
}