| Index: content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
|
| index 5b2e911680be374cd2ebe306422439c3db336310..e18924dd0b10667561858a1acfc932a5fcb38bb0 100644
|
| --- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
|
| +++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
|
| @@ -17,6 +17,7 @@ import android.util.Log;
|
| import android.view.Surface;
|
|
|
| import org.chromium.base.CalledByNative;
|
| +import org.chromium.base.CommandLine;
|
| import org.chromium.base.JNINamespace;
|
| import org.chromium.base.library_loader.LibraryLoader;
|
| import org.chromium.base.library_loader.Linker;
|
| @@ -147,6 +148,12 @@ public class ChildProcessService extends Service {
|
| }
|
| }
|
| boolean isLoaded = false;
|
| + synchronized (mMainThread) {
|
| + while (mCommandLineParams == null) {
|
| + mMainThread.wait();
|
| + }
|
| + }
|
| + CommandLine.init(mCommandLineParams);
|
| try {
|
| LibraryLoader.loadNow(getApplicationContext(), false);
|
| isLoaded = true;
|
| @@ -170,12 +177,7 @@ public class ChildProcessService extends Service {
|
| if (!isLoaded) {
|
| System.exit(-1);
|
| }
|
| - synchronized (mMainThread) {
|
| - while (mCommandLineParams == null) {
|
| - mMainThread.wait();
|
| - }
|
| - }
|
| - LibraryLoader.initialize(mCommandLineParams);
|
| + LibraryLoader.initialize();
|
| synchronized (mMainThread) {
|
| mLibraryInitialized = true;
|
| mMainThread.notifyAll();
|
|
|