Index: mojo/shell/mojo_url_resolver.cc |
diff --git a/mojo/shell/mojo_url_resolver.cc b/mojo/shell/mojo_url_resolver.cc |
index beaa8d8546ab80b5d43b4f819dff9f73c1258370..8d37237d40e0c99f3c9915a607045505025ce470 100644 |
--- a/mojo/shell/mojo_url_resolver.cc |
+++ b/mojo/shell/mojo_url_resolver.cc |
@@ -8,6 +8,7 @@ |
#include "base/files/file_path.h" |
#include "base/logging.h" |
#include "base/path_service.h" |
+#include "base/strings/string_util.h" |
#include "mojo/shell/filename_util.h" |
#include "url/url_util.h" |
@@ -15,7 +16,14 @@ namespace mojo { |
namespace shell { |
namespace { |
-std::string MakeSharedLibraryName(const std::string& host_name) { |
+std::string MakeSharedLibraryName(std::string host_name) { |
+ // TODO(aa): This should go away soon. In the Chromium repo, all the app |
+ // target names start with "mojo_" by convention. But when we have an SDK, |
+ // one would assume the libraries would have names that don't have this bit. |
+ std::string prefix = "mojo_"; |
+ if (!StartsWithASCII(host_name, prefix, true)) |
+ host_name = prefix + host_name; |
+ |
#if defined(OS_WIN) |
return host_name + ".dll"; |
#elif defined(OS_LINUX) || defined(OS_ANDROID) |