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 "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 #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 |
(...skipping 18 matching lines...) Expand all Loading... |
29 default: | 29 default: |
30 NOTREACHED(); | 30 NOTREACHED(); |
31 return false; | 31 return false; |
32 } | 32 } |
33 } | 33 } |
34 | 34 |
35 } // namespace | 35 } // namespace |
36 | 36 |
37 // This is called by the VM when the shared library is first loaded. | 37 // This is called by the VM when the shared library is first loaded. |
38 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 38 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
39 base::android::DisableManualJniRegistration(); | |
40 base::android::InitVM(vm); | 39 base::android::InitVM(vm); |
| 40 base::android::SetJniRegistrationType(base::android::NO_JNI_REGISTRATION); |
41 base::android::SetNativeInitializationHook(NativeInit); | 41 base::android::SetNativeInitializationHook(NativeInit); |
42 return JNI_VERSION_1_4; | 42 return JNI_VERSION_1_4; |
43 } | 43 } |
OLD | NEW |