Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1245)

Unified Diff: base/android/base_jni_onload.cc

Issue 920883002: Use combined native/manual JNI registration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/android_webview_tests.gypi ('k') | base/android/jni_generator/jni_generator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/base_jni_onload.cc
diff --git a/base/android/base_jni_onload.cc b/base/android/base_jni_onload.cc
index ae64120902741e28a83f13f4f7da2e52e946bdd5..ef46b9fdfbbc3a27f109e481cf7f3764e05d6823 100644
--- a/base/android/base_jni_onload.cc
+++ b/base/android/base_jni_onload.cc
@@ -6,6 +6,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_onload_delegate.h"
+#include "base/android/jni_utils.h"
#include "base/android/library_loader/library_loader_hooks.h"
namespace base {
@@ -48,6 +49,9 @@ bool OnJNIOnLoad(JavaVM* vm,
}
if (ret) {
+ base::android::InitReplacementClassLoader(env,
+ base::android::GetClassLoader(env));
michaelbai 2015/02/13 04:36:07 Move this to BaseJNIOnLoadDelegate::Init()
Torne 2015/02/13 14:08:04 Hm. The JNI environment isn't passed to the init f
+
for (std::vector<JNIOnLoadDelegate*>::reverse_iterator i =
delegates->rbegin(); i != delegates->rend(); ++i) {
if (!(*i)->Init()) {
« no previous file with comments | « android_webview/android_webview_tests.gypi ('k') | base/android/jni_generator/jni_generator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698