summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-10 04:01:54 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-10 04:01:54 +0000
commit8ef88526142dfa56ce9d3e82fbea4b4536ed2774 (patch)
tree696f70cf003df89fea2e414efc31895aecc53b32 /mojo/shell
parent3c1cbda2c5b690b552627f2b20e7164925c55f4f (diff)
downloadchromium_src-8ef88526142dfa56ce9d3e82fbea4b4536ed2774.zip
chromium_src-8ef88526142dfa56ce9d3e82fbea4b4536ed2774.tar.gz
chromium_src-8ef88526142dfa56ce9d3e82fbea4b4536ed2774.tar.bz2
Mojo: Fix mojo_test_service.
It should depend on mojo_system, not mojo_system_impl, since it's a proper external app. (For some reason, this didn't cause failures for me on Linux or Windows ... probably because they were component=shared_library builds. I think I'm still using a static library build on Mac....) R=sky@chromium.org Review URL: https://codereview.chromium.org/321503004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/in_process_dynamic_service_runner.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/mojo/shell/in_process_dynamic_service_runner.cc b/mojo/shell/in_process_dynamic_service_runner.cc
index 5b3c935..c367b08 100644
--- a/mojo/shell/in_process_dynamic_service_runner.cc
+++ b/mojo/shell/in_process_dynamic_service_runner.cc
@@ -48,8 +48,8 @@ void InProcessDynamicServiceRunner::Start(
}
void InProcessDynamicServiceRunner::Run() {
- DVLOG(2) << "Loading/running Mojo app from " << app_path_.value()
- << " in process";
+ DVLOG(2) << "Loading/running Mojo app in process from library: "
+ << app_path_.value();
base::ScopedClosureRunner app_deleter(
base::Bind(base::IgnoreResult(&base::DeleteFile), app_path_, false));
@@ -59,7 +59,7 @@ void InProcessDynamicServiceRunner::Run() {
base::ScopedNativeLibrary app_library(
base::LoadNativeLibrary(app_path_, &error));
if (!app_library.is_valid()) {
- LOG(ERROR) << "Failed to load library (error: " << error.ToString()
+ LOG(ERROR) << "Failed to load app library (error: " << error.ToString()
<< ")";
break;
}
@@ -72,10 +72,14 @@ void InProcessDynamicServiceRunner::Run() {
size_t expected_size = mojo_set_system_thunks_fn(&system_thunks);
if (expected_size > sizeof(MojoSystemThunks)) {
LOG(ERROR)
- << "Invalid DSO. Expected MojoSystemThunks size: "
+ << "Invalid app library: expected MojoSystemThunks size: "
<< expected_size;
break;
}
+ } else {
+ // Strictly speaking this is not required, but it's very unusual to have
+ // an app that doesn't require the basic system library.
+ LOG(WARNING) << "MojoSetSystemThunks not found in app library";
}
typedef MojoResult (*MojoMainFunction)(MojoHandle);