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

Unified Diff: mojo/runner/host/in_process_native_runner.cc

Issue 1512213003: Fix mojo_runner hang on Windows with component build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/host/in_process_native_runner.cc
diff --git a/mojo/runner/host/in_process_native_runner.cc b/mojo/runner/host/in_process_native_runner.cc
index 1182fb6d4c4628fdd42357d300d742770b5ae720..cb5b2b6fc24b161b8e2218988926942a9d5d9c6f 100644
--- a/mojo/runner/host/in_process_native_runner.cc
+++ b/mojo/runner/host/in_process_native_runner.cc
@@ -64,7 +64,11 @@ void InProcessNativeRunner::Run() {
// TODO(vtl): ScopedNativeLibrary doesn't have a .get() method!
base::NativeLibrary app_library = LoadNativeApplication(app_path_);
app_library_.Reset(app_library);
+ // This hangs on Windows in the component build, so skip it since it's
+ // unnecessary.
+#if !(defined(COMPONENT_BUILD) && defined(OS_WIN))
CallLibraryEarlyInitialization(app_library);
+#endif
RunNativeApplication(app_library, application_request_.Pass());
app_completed_callback_runner_.Run();
app_completed_callback_runner_.Reset();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698