Merge "Remove extra newline in logs" into main am: 2a5ed0c0c3
Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2925272
Change-Id: I94ef25dd64b9dbd35269550a46b60d0b4981c13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
GitOrigin-RevId: 5238b9a6113716f32793750748829fe60f6a7f0a
diff --git a/base/SharedLibrary.cpp b/base/SharedLibrary.cpp
index edcfa3e..e8e9395 100644
--- a/base/SharedLibrary.cpp
+++ b/base/SharedLibrary.cpp
@@ -61,7 +61,7 @@
// static
SharedLibrary* SharedLibrary::open(const char* libraryName) {
- INFO("SharedLibrary::open for [%s]\n", libraryName);
+ INFO("SharedLibrary::open for [%s]", libraryName);
char error[1];
return open(libraryName, error, sizeof(error));
}
@@ -72,7 +72,7 @@
auto lib = s_libraryMap.find(libraryName);
if (lib == s_libraryMap.end()) {
- INFO("SharedLibrary::open for [%s]: not found in map, open for the first time\n",
+ INFO("SharedLibrary::open for [%s]: not found in map, open for the first time",
libraryName);
SharedLibrary* load = do_open(libraryName, error, errorSize);
if (load != nullptr) {
@@ -91,19 +91,19 @@
SharedLibrary* SharedLibrary::do_open(const char* libraryName,
char* error,
size_t errorSize) {
- INFO("SharedLibrary::open for [%s] (win32): call LoadLibrary\n", libraryName);
+ INFO("SharedLibrary::open for [%s] (win32): call LoadLibrary", libraryName);
HMODULE lib = LoadLibraryA(libraryName);
// Try a bit harder to find the shared library if we cannot find it.
if (!lib) {
- INFO("SharedLibrary::open for [%s] can't find in default path. Searching alternatives...\n",
+ INFO("SharedLibrary::open for [%s] can't find in default path. Searching alternatives...",
libraryName);
sSearchPaths()->forEachPath([&lib, libraryName](const std::string& path) {
if (!lib) {
auto libName = PathUtils::join(path, libraryName);
- INFO("SharedLibrary::open for [%s]: trying [%s]\n", libraryName, libName.c_str());
+ INFO("SharedLibrary::open for [%s]: trying [%s]", libraryName, libName.c_str());
lib = LoadLibraryA(libName.c_str());
- INFO("SharedLibrary::open for [%s]: trying [%s]. found? %d\n", libraryName,
+ INFO("SharedLibrary::open for [%s]: trying [%s]. found? %d", libraryName,
libName.c_str(), lib != nullptr);
}
});
@@ -113,12 +113,12 @@
constexpr size_t kMaxPathLength = 2048;
char fullPath[kMaxPathLength];
GetModuleFileNameA(lib, fullPath, kMaxPathLength);
- INFO("SharedLibrary::open succeeded for [%s]. File name: [%s]\n", libraryName, fullPath);
+ INFO("SharedLibrary::open succeeded for [%s]. File name: [%s]", libraryName, fullPath);
return new SharedLibrary(lib);
}
if (errorSize == 0) {
- INFO("SharedLibrary::open for [%s] failed, but no error\n", libraryName);
+ INFO("SharedLibrary::open for [%s] failed, but no error", libraryName);
return NULL;
}
@@ -151,7 +151,7 @@
if (ret > 0 && error[ret - 1] == '\r') {
error[--ret] = '\0';
}
- INFO("Failed to load [%s]. Error string: [%s]\n", libraryName, error);
+ INFO("Failed to load [%s]. Error string: [%s]", libraryName, error);
return NULL;
}
@@ -183,7 +183,7 @@
SharedLibrary* SharedLibrary::do_open(const char* libraryName,
char* error,
size_t errorSize) {
- INFO("SharedLibrary::open for [%s] (posix): begin\n", libraryName);
+ INFO("SharedLibrary::open for [%s] (posix): begin", libraryName);
const char* libPath = libraryName;
char* path = NULL;
@@ -212,12 +212,12 @@
// On OSX, some libraries don't include an extension (notably OpenGL)
// On OSX we try to open |libraryName| first. If that doesn't exist,
// we try |libraryName|.dylib
- INFO("SharedLibrary::open for [%s] (posix,darwin): call dlopen\n", libraryName);
+ INFO("SharedLibrary::open for [%s] (posix,darwin): call dlopen", libraryName);
void* lib = dlopen(libraryName, RTLD_NOW);
if (lib == NULL) {
INFO(
"SharedLibrary::open for [%s] (posix,darwin): failed, "
- "try again with [%s]\n",
+ "try again with [%s]",
libraryName, libPath);
lib = dlopen(libPath, RTLD_NOW);
@@ -226,14 +226,14 @@
auto libName = PathUtils::join(path, libraryName);
INFO(
"SharedLibrary::open for [%s] (posix,darwin): still failed, "
- "try [%s]\n",
+ "try [%s]",
libraryName, libName.c_str());
lib = dlopen(libName.c_str(), RTLD_NOW);
if (!lib) {
auto libPathName = PathUtils::join(path, libPath);
INFO(
"SharedLibrary::open for [%s] (posix,darwin): still failed, "
- "try [%s]\n",
+ "try [%s]",
libraryName, libPathName.c_str());
lib = dlopen(libPathName.c_str(), RTLD_NOW);
}
@@ -241,14 +241,14 @@
});
}
#else
- INFO("SharedLibrary::open for [%s] (posix,linux): call dlopen on [%s]\n", libraryName, libPath);
+ INFO("SharedLibrary::open for [%s] (posix,linux): call dlopen on [%s]", libraryName, libPath);
void* lib = dlopen(libPath, RTLD_NOW);
#endif
sSearchPaths()->forEachPath([&lib, libPath, libraryName](const std::string& path) {
if (!lib) {
auto libPathName = PathUtils::join(path, libPath);
- INFO("SharedLibrary::open for [%s] (posix): try again with %s\n", libraryName,
+ INFO("SharedLibrary::open for [%s] (posix): try again with %s", libraryName,
libPathName.c_str());
lib = dlopen(libPathName.c_str(), RTLD_NOW);
}
@@ -259,11 +259,12 @@
}
if (lib) {
+ INFO("SharedLibrary::open succeeded for [%s].", libraryName);
return new SharedLibrary(lib);
}
snprintf(error, errorSize, "%s", dlerror());
- INFO("SharedLibrary::open for [%s] failed (posix). dlerror: [%s]\n", libraryName, error);
+ INFO("SharedLibrary::open for [%s] failed (posix). dlerror: [%s]", libraryName, error);
return NULL;
}
