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

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

Issue 12464004: Handle LibraryLoader error from the renderer process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase gypi Created 7 years, 9 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
« no previous file with comments | « no previous file | build/android/java_cpp_template.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
index 4d6c1ff14213f921411fe80413b239325cb59ee3..e930af1b3913c53dc8e6673d2ffadd48ea291572 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
@@ -11,7 +11,6 @@ import org.chromium.base.PathUtils;
import org.chromium.base.ThreadUtils;
import org.chromium.content.app.LibraryLoader;
import org.chromium.content.browser.AndroidBrowserProcess;
-import org.chromium.content.browser.ResourceExtractor;
import org.chromium.content.common.ProcessInitException;
/**
@@ -35,7 +34,11 @@ public abstract class AwBrowserProcess {
public static void loadLibrary() {
PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
LibraryLoader.setLibraryToLoad(NATIVE_LIBRARY);
- LibraryLoader.loadNow();
+ try {
+ LibraryLoader.loadNow();
+ } catch (ProcessInitException e) {
+ throw new RuntimeException("Cannot load WebView", e);
+ }
}
// TODO(joth): remove when downstream is using new version below.
« no previous file with comments | « no previous file | build/android/java_cpp_template.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698