Merge "Don't crash zygote if webcore fails to load"

2011-02-01 12:41:55 -08:00
parent 056340ac95 c0e95048b9
commit eb17d6f51a
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@ -58,7 +58,11 @@ final class WebViewCore {
        // Load libwebcore during static initialization. This happens in the
        // zygote process so it will be shared read-only across all app
        // processes.
-        System.loadLibrary("webcore");
+        try {
+            System.loadLibrary("webcore");
+        } catch (UnsatisfiedLinkError e) {
+            Log.e(LOGTAG, "Unable to load webcore library");
+        }
    }

    /*