From 492bbe3f7b42860dafe5435203ea30278bf76b6c Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 1 Sep 2011 03:27:26 +0100 Subject: [PATCH] Preload libchromium_net in addition to libwebcore. To improve WebView app startup time, preload libchromium_net which was recently split from libwebcore into its own shared library. Bug: 5112647 Change-Id: I4417d5a4f8c7783e8fa7b8eaddf89aaeb3693fac --- core/java/android/webkit/JniUtil.java | 1 + core/java/android/webkit/WebViewCore.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/java/android/webkit/JniUtil.java b/core/java/android/webkit/JniUtil.java index 4264e9da354f2..ef1641de73aa5 100644 --- a/core/java/android/webkit/JniUtil.java +++ b/core/java/android/webkit/JniUtil.java @@ -28,6 +28,7 @@ class JniUtil { static { System.loadLibrary("webcore"); + System.loadLibrary("chromium_net"); } private static final String LOGTAG = "webkit"; private JniUtil() {} // Utility class, do not instantiate. diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 3ca3eaad3c1ca..c9bea217f5c04 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -57,13 +57,14 @@ public final class WebViewCore { private static final String LOGTAG = "webcore"; static { - // Load libwebcore during static initialization. This happens in the - // zygote process so it will be shared read-only across all app - // processes. + // Load libwebcore and libchromium_net during static initialization. + // This happens in the zygote process so they will be shared read-only + // across all app processes. try { System.loadLibrary("webcore"); + System.loadLibrary("chromium_net"); } catch (UnsatisfiedLinkError e) { - Log.e(LOGTAG, "Unable to load webcore library"); + Log.e(LOGTAG, "Unable to load native support libraries."); } }