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/library_loader/library_loader_hooks.h" | 6 #include "base/android/library_loader/library_loader_hooks.h" |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "chrome/app/android/chrome_jni_onload.h" | 8 #include "chrome/app/android/chrome_jni_onload.h" |
9 | 9 |
10 namespace { | 10 namespace { |
11 | 11 |
12 bool RegisterJNI(JNIEnv* env) { | 12 bool RegisterJNI(JNIEnv* env) { |
13 return true; | 13 return true; |
14 } | 14 } |
15 | 15 |
16 bool Init() { | 16 bool Init() { |
17 return true; | 17 return true; |
18 } | 18 } |
19 | 19 |
20 bool NativeInit() { | 20 bool NativeInit() { |
21 return android::OnJNIOnLoadInit(base::Bind(&Init)); | 21 return android::OnJNIOnLoadInit(base::Bind(&Init)); |
22 } | 22 } |
23 | 23 |
24 } // namespace | 24 } // namespace |
25 | 25 |
26 // This is called by the VM when the shared library is first loaded. | 26 // This is called by the VM when the shared library is first loaded. |
27 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 27 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 28 base::android::InitVM(vm); |
| 29 base::android::InitJniRegistrationType(base::android::AttachCurrentThread()); |
28 if (!android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI))) { | 30 if (!android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI))) { |
29 return -1; | 31 return -1; |
30 } | 32 } |
31 base::android::SetNativeInitializationHook(NativeInit); | 33 base::android::SetNativeInitializationHook(NativeInit); |
32 return JNI_VERSION_1_4; | 34 return JNI_VERSION_1_4; |
33 } | 35 } |
OLD | NEW |