From c0e95048b95f40e39e57d4420fdab1566fb06da8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Mon, 31 Jan 2011 15:43:19 -0800
Subject: Don't crash zygote if webcore fails to load

Change-Id: I88271fb62c0cc7c6d768009a713f20d9dfbfb5eb
---
 core/java/android/webkit/WebViewCore.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index f54b20704e77..e36602f4b4a2 100644
--- 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");
+        }
     }
 
     /*
-- 
cgit v1.2.3-59-g8ed1b