Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Preload libchromium_net in addition to libwebcore."

Browse Source
This commit is contained in:
Ben Murdoch
2011-09-01 10:40:29 -07:00
committed by Android (Google) Code Review
parent 6c859576ad 492bbe3f7b
commit ea24a4015a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/webkit/JniUtil.java
View File

@@ -28,6 +28,7 @@ class JniUtil {
static { static {
System.loadLibrary("webcore"); System.loadLibrary("webcore");
System.loadLibrary("chromium_net");
} }
private static final String LOGTAG = "webkit"; private static final String LOGTAG = "webkit";
private JniUtil() {} // Utility class, do not instantiate. private JniUtil() {} // Utility class, do not instantiate.

9
core/java/android/webkit/WebViewCore.java
View File

@@ -57,13 +57,14 @@ public final class WebViewCore {
private static final String LOGTAG = "webcore"; private static final String LOGTAG = "webcore";
static { static {
// Load libwebcore during static initialization. This happens in the // Load libwebcore and libchromium_net during static initialization.
// zygote process so it will be shared read-only across all app // This happens in the zygote process so they will be shared read-only
// processes. // across all app processes.
try { try {
System.loadLibrary("webcore"); System.loadLibrary("webcore");
System.loadLibrary("chromium_net");
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
Log.e(LOGTAG, "Unable to load webcore library"); Log.e(LOGTAG, "Unable to load native support libraries.");
} }
} }