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 e7ea8af938d7c8a5faaad2c1c837f6c7f5a3e9e6..858601f3ba0335fe7f32870ddb5df7b947a6b63a 100644 |
--- a/android_webview/lib/main/webview_entry_point.cc |
+++ b/android_webview/lib/main/webview_entry_point.cc |
@@ -27,6 +27,11 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
if (!content::RegisterLibraryLoaderEntryHook(env)) |
return -1; |
+ // Register content JNI functions now, rather than waiting until |
+ // LibraryLoadedOnMainThread, so that we can call into native code early. |
+ if (!content::EnsureJniRegistered(env)) |
+ return -1; |
+ |
// Register JNI for components we depend on. |
if (!RegisterNativeMethods( |
env, |