Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1769)

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwCookieManager.java

Issue 2593653002: Split JNI init so native library preloading dosn't cause native init. (Closed)
Patch Set: Add library initialization to AwCookieManager constructor Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/java/src/org/chromium/android_webview/AwCookieManager.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java b/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java
index a4350dbf2d6e2a6579feaa36ef383e20d8cf631a..1b046041cc1dfc72be1f615a511b250bbdb2ea1f 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java
@@ -10,6 +10,9 @@ import android.webkit.ValueCallback;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.library_loader.LibraryLoader;
+import org.chromium.base.library_loader.LibraryProcessType;
+import org.chromium.base.library_loader.ProcessInitException;
/**
* AwCookieManager manages cookies according to RFC2109 spec.
@@ -19,6 +22,14 @@ import org.chromium.base.annotations.JNINamespace;
@JNINamespace("android_webview")
public final class AwCookieManager {
+ public AwCookieManager() {
+ try {
+ LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW).ensureInitialized();
Torne 2017/01/03 12:13:50 I'm guessing this is because cookie manager relies
Tobias Sargeant 2017/01/04 00:24:53 In comment #8 Robert pasted the exception in quest
+ } catch (ProcessInitException e) {
+ throw new RuntimeException("Error initializing WebView library", e);
+ }
+ }
+
/**
* Control whether cookie is enabled or disabled
* @param accept TRUE if accept cookie

Powered by Google App Engine
This is Rietveld 408576698