Use combined native/manual JNI registration.

base/android/base_jni_onload.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/android/base_jni_onload.h"
 
 #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 {
 namespace android {
 
 namespace {
 
 // The JNIOnLoadDelegate implementation in base.
 class BaseJNIOnLoadDelegate : public JNIOnLoadDelegate {
  public:
@@ skipping 22 matching lines @@
   bool ret = true;
   for (std::vector<JNIOnLoadDelegate*>::reverse_iterator i =
            delegates->rbegin(); i != delegates->rend(); ++i) {
     if (!(*i)->RegisterJNI(env)) {
       ret = false;
       break;
     }
   }
 
   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 functions, which makes this
mildly annoying. Do none of them need it, or are they just all getting it with
AttachCurrentThread? If several of the init functions need it, then maybe it
should get passed to Init() as well as to RegisterJNI()..

+
     for (std::vector<JNIOnLoadDelegate*>::reverse_iterator i =
              delegates->rbegin(); i != delegates->rend(); ++i) {
       if (!(*i)->Init()) {
         ret = false;
         break;
       }
     }
   }
   delegates->pop_back();
   return ret;
 }
 
 }  // namespace android
 }  // namespace base