OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "android_webview/lib/main/webview_jni_onload.h" | 5 #include "android_webview/lib/main/webview_jni_onload.h" |
6 #include "base/android/jni_android.h" | 6 #include "base/android/jni_android.h" |
7 #include "base/android/library_loader/library_loader_hooks.h" | 7 #include "base/android/library_loader/library_loader_hooks.h" |
8 | 8 |
9 // This is called by the VM when the shared library is first loaded. | 9 // This is called by the VM when the shared library is first loaded. |
10 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here. | 10 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here. |
11 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 11 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
12 // WebView uses native JNI exports; disable manual JNI registration because | |
13 // we don't have a good way to detect the JNI registrations which is called, | |
14 // outside of OnJNIOnLoadRegisterJNI code path. | |
15 base::android::DisableManualJniRegistration(); | |
16 base::android::InitVM(vm); | 12 base::android::InitVM(vm); |
| 13 base::android::InitJniRegistrationType(base::android::AttachCurrentThread()); |
17 base::android::SetNativeInitializationHook(&android_webview::OnJNIOnLoadInit); | 14 base::android::SetNativeInitializationHook(&android_webview::OnJNIOnLoadInit); |
18 return JNI_VERSION_1_4; | 15 return JNI_VERSION_1_4; |
19 } | 16 } |
OLD | NEW |