| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/android/jni_android.h" | 5 #include "base/android/jni_android.h" |
| 6 #include "base/android/jni_utils.h" | 6 #include "base/android/jni_utils.h" |
| 7 #include "base/android/library_loader/library_loader_hooks.h" | 7 #include "base/android/library_loader/library_loader_hooks.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "chrome/app/android/chrome_jni_onload.h" | 9 #include "chrome/app/android/chrome_jni_onload.h" |
| 10 | 10 |
| 11 namespace { | 11 namespace { |
| 12 | 12 |
| 13 bool RegisterJNI(JNIEnv* env) { | |
| 14 return true; | |
| 15 } | |
| 16 | |
| 17 bool Init() { | |
| 18 return true; | |
| 19 } | |
| 20 | |
| 21 bool NativeInit() { | 13 bool NativeInit() { |
| 22 return android::OnJNIOnLoadInit(base::Bind(&Init)); | 14 return android::OnJNIOnLoadInit(); |
| 23 } | 15 } |
| 24 | 16 |
| 25 } // namespace | 17 } // namespace |
| 26 | 18 |
| 27 // This is called by the VM when the shared library is first loaded. | 19 // This is called by the VM when the shared library is first loaded. |
| 28 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 20 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 29 // By default, all JNI methods are registered. However, since render processes | 21 // By default, all JNI methods are registered. However, since render processes |
| 30 // don't need very much Java code, we enable selective JNI registration on the | 22 // don't need very much Java code, we enable selective JNI registration on the |
| 31 // Java side and only register a subset of JNI methods. | 23 // Java side and only register a subset of JNI methods. |
| 32 base::android::InitVM(vm); | 24 base::android::InitVM(vm); |
| 33 JNIEnv* env = base::android::AttachCurrentThread(); | 25 JNIEnv* env = base::android::AttachCurrentThread(); |
| 34 if (base::android::isSelectiveJniRegistrationEnabled(env)) { | 26 if (base::android::isSelectiveJniRegistrationEnabled(env)) { |
| 35 base::android::SetJniRegistrationType( | 27 base::android::SetJniRegistrationType( |
| 36 base::android::SELECTIVE_JNI_REGISTRATION); | 28 base::android::SELECTIVE_JNI_REGISTRATION); |
| 37 } | 29 } |
| 38 if (!android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI))) { | 30 if (!android::OnJNIOnLoadRegisterJNI(env)) { |
| 39 return -1; | 31 return -1; |
| 40 } | 32 } |
| 41 base::android::SetNativeInitializationHook(NativeInit); | 33 base::android::SetNativeInitializationHook(NativeInit); |
| 42 return JNI_VERSION_1_4; | 34 return JNI_VERSION_1_4; |
| 43 } | 35 } |
| OLD | NEW |