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

Unified Diff: content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

Issue 289303004: Allow native command line arguments to be initialized early. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase More. Created 6 years, 4 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 | « content/app/android/library_loader_hooks.cc ('k') | content/public/app/android_library_loader_hooks.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « content/app/android/library_loader_hooks.cc ('k') | content/public/app/android_library_loader_hooks.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698