| Index: content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java
|
| index 13c8c580797fdf8f5adf3c0e7d2275828e0b0077..54e856db334afacba97073262b7b44f8db029025 100644
|
| --- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java
|
| +++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java
|
| @@ -16,16 +16,16 @@ import android.os.RemoteException;
|
| import android.util.Log;
|
| import android.view.Surface;
|
|
|
| -import java.util.ArrayList;
|
| -
|
| import org.chromium.base.CalledByNative;
|
| import org.chromium.base.JNINamespace;
|
| -import org.chromium.content.app.ContentMain;
|
| import org.chromium.content.browser.SandboxedProcessConnection;
|
| import org.chromium.content.common.ISandboxedProcessCallback;
|
| import org.chromium.content.common.ISandboxedProcessService;
|
| +import org.chromium.content.browser.SandboxedProcessLauncher;
|
| import org.chromium.content.common.ProcessInitException;
|
|
|
| +import java.util.ArrayList;
|
| +
|
| /**
|
| * This is the base class for sandboxed services; the SandboxedProcessService0, 1.. etc
|
| * subclasses provide the concrete service entry points, to enable the browser to connect
|
| @@ -118,7 +118,12 @@ public class SandboxedProcessService extends Service {
|
| }
|
| }
|
| LibraryLoader.setLibraryToLoad(mNativeLibraryName);
|
| - LibraryLoader.loadNow();
|
| + try {
|
| + LibraryLoader.loadNow();
|
| + } catch (ProcessInitException e) {
|
| + Log.e(TAG, "Failed to load native library, exiting sandboxed process", e);
|
| + return;
|
| + }
|
| synchronized (mSandboxMainThread) {
|
| while (mCommandLineParams == null) {
|
| mSandboxMainThread.wait();
|
|
|