Index: android_webview/lib/main/webview_entry_point.cc |
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc |
index 04a52dfa134b8a335a5c0d70c9173fa50ef7def1..2053910599c366a5bff4d07a43c2bcb3ce16f6dc 100644 |
--- a/android_webview/lib/main/webview_entry_point.cc |
+++ b/android_webview/lib/main/webview_entry_point.cc |
@@ -3,6 +3,7 @@ |
// found in the LICENSE file. |
#include "android_webview/lib/main/webview_main_delegate.h" |
+#include "android_webview/native/android_webview_jni_registrar.h" |
#include "base/android/jni_android.h" |
#include "content/public/app/android_library_loader_hooks.h" |
#include "content/public/app/content_main.h" |
@@ -12,9 +13,11 @@ |
JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
base::android::InitVM(vm); |
JNIEnv* env = base::android::AttachCurrentThread(); |
- if (!content::RegisterLibraryLoaderEntryHook(env)) { |
+ if (!content::RegisterLibraryLoaderEntryHook(env)) |
+ return -1; |
+ |
+ if (!android_webview::RegisterJni(env)) |
return -1; |
- } |
content::SetContentMainDelegate(new android_webview::WebViewMainDelegate()); |