diff options
| author | jam <jam@chromium.org> | 2015-12-10 10:59:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-10 19:00:43 +0000 |
| commit | a5253da8165a64a3d9b9893ad372f9a2eaf64c27 (patch) | |
| tree | 46f392d318006f4aa00fd601914e7010680afc41 /mojo/runner | |
| parent | 91a8470f2902978d9fbdc6de3618f6f7d374c014 (diff) | |
| download | chromium_src-a5253da8165a64a3d9b9893ad372f9a2eaf64c27.zip chromium_src-a5253da8165a64a3d9b9893ad372f9a2eaf64c27.tar.gz chromium_src-a5253da8165a64a3d9b9893ad372f9a2eaf64c27.tar.bz2 | |
Fix mojo_runner hang on Windows with component build.
For some reason reinitializing base, and icu, ends up hanging in Windows loader lock.
Now
mojo_runner.exe --gtest_list_tests mojo:clipboard_apptests
doesn't hang with component builds on Windows.
Review URL: https://codereview.chromium.org/1512213003
Cr-Commit-Position: refs/heads/master@{#364417}
Diffstat (limited to 'mojo/runner')
| -rw-r--r-- | mojo/runner/host/in_process_native_runner.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mojo/runner/host/in_process_native_runner.cc b/mojo/runner/host/in_process_native_runner.cc index 1182fb6..cb5b2b6 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(); |