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

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

Issue 897683003: Know the process shared library loaded in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix again Created 5 years, 10 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/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 f13ecac4583143e94b8371d5076d8126571b7874..96d9fb08ef9ff3464d79d897f841c7fd5bbe6ba3 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
@@ -10,6 +10,7 @@ import android.util.Log;
import org.chromium.base.PathUtils;
import org.chromium.base.ThreadUtils;
import org.chromium.base.library_loader.LibraryLoader;
+import org.chromium.base.library_loader.LibraryProcessType;
import org.chromium.base.library_loader.ProcessInitException;
import org.chromium.content.browser.BrowserStartupController;
import org.chromium.media.MediaDrmBridge;
@@ -32,14 +33,15 @@ public abstract class AwBrowserProcess {
public static void loadLibrary() {
PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
try {
- LibraryLoader.loadNow();
+ LibraryLoader libraryLoader = LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW);
+ libraryLoader.loadNow();
+ // Switch the command line implementation from Java to native.
+ // It's okay for the WebView to do this before initialization because we have
+ // setup the JNI bindings by this point.
+ libraryLoader.switchCommandLineForWebView();
} catch (ProcessInitException e) {
throw new RuntimeException("Cannot load WebView", e);
}
- // Switch the command line implementation from Java to native.
- // It's okay for the WebView to do this before initialization because we have
- // setup the JNI bindings by this point.
- LibraryLoader.switchCommandLineForWebView();
}
/**
@@ -56,7 +58,8 @@ public abstract class AwBrowserProcess {
@Override
public void run() {
try {
- BrowserStartupController.get(context).startBrowserProcessesSync(true);
+ BrowserStartupController.get(context, LibraryProcessType.PROCESS_WEBVIEW)
+ .startBrowserProcessesSync(true);
initializePlatformKeySystem();
} catch (ProcessInitException e) {
throw new RuntimeException("Cannot initialize WebView", e);

Powered by Google App Engine
This is Rietveld 408576698