tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "linker: add more context to link failure error."

Browse source
This commit is contained in:
Treehugger Robot 2019-11-09 00:13:31 +00:00 committed by Gerrit Code Review
commit 28fb781ef7
3 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
linker/linker.cpp
View file

@ -1503,7 +1503,16 @@ static bool load_library(android_namespace_t* ns,
// Open the file.
int fd = open_library(ns, zip_archive_cache, name, needed_by, &file_offset, &realpath);
if (fd == -1) {
DL_OPEN_ERR("library \"%s\" not found", name);
if (task->is_dt_needed()) {
if (needed_by->is_main_executable()) {
DL_OPEN_ERR("library \"%s\" not found: needed by main executable", name);
} else {
DL_OPEN_ERR("library \"%s\" not found: needed by %s in namespace %s", name,
needed_by->get_realpath(), task->get_start_from()->get_name());
}
} else {
DL_OPEN_ERR("library \"%s\" not found", name);
}
return false;
}

5
tests/dl_test.cpp
View file

@ -204,7 +204,10 @@ TEST(dl, exec_with_ld_preload) {
// The two libs are in ns2/ subdir.
TEST(dl, exec_without_ld_config_file) {
#if defined(__BIONIC__)
std::string error_message = "CANNOT LINK EXECUTABLE \"" + GetTestlibRoot() + "/ld_config_test_helper/ld_config_test_helper\": library \"ld_config_test_helper_lib1.so\" not found\n";
std::string error_message =
"CANNOT LINK EXECUTABLE \"" + GetTestlibRoot() +
"/ld_config_test_helper/ld_config_test_helper\": library \"ld_config_test_helper_lib1.so\" "
"not found: needed by main executable\n";
std::string helper = GetTestlibRoot() +
"/ld_config_test_helper/ld_config_test_helper";
chmod(helper.c_str(), 0755);

15
tests/dlext_test.cpp
View file

@ -28,6 +28,7 @@
#include <android/dlext.h>
#include <android-base/file.h>
#include <android-base/strings.h>
#include <android-base/test_utils.h>
#include <sys/mman.h>
#include <sys/types.h>
@ -1374,7 +1375,10 @@ TEST(dlext, ns_isolated) {
void* handle2 = android_dlopen_ext(root_lib, RTLD_NOW, &extinfo);
ASSERT_TRUE(handle2 == nullptr);
ASSERT_STREQ("dlopen failed: library \"libnstest_private_external.so\" not found", dlerror());
const char* error = dlerror();
ASSERT_MATCH(error,
R"(dlopen failed: library "libnstest_private_external.so" not found: needed by )"
R"(\S+libnstest_root_not_isolated.so in namespace private_isolated1)");
// Check dlopen by absolute path
handle2 = android_dlopen_ext(lib_private_external_path.c_str(), RTLD_NOW, &extinfo);
@ -1502,7 +1506,9 @@ TEST(dlext, ns_shared) {
void* handle2 = android_dlopen_ext(root_lib, RTLD_NOW, &extinfo);
ASSERT_TRUE(handle2 == nullptr);
ASSERT_STREQ("dlopen failed: library \"libnstest_private_external.so\" not found", dlerror());
ASSERT_MATCH(dlerror(),
R"(dlopen failed: library "libnstest_private_external.so" not found: needed by )"
R"(\S+libnstest_root_not_isolated.so in namespace private_isolated_shared)");
// Check dlopen by absolute path
handle2 = android_dlopen_ext(lib_private_external_path.c_str(), RTLD_NOW, &extinfo);
@ -1762,7 +1768,10 @@ TEST(dlext, ns_isolated_rtld_global) {
handle1 = android_dlopen_ext(root_lib, RTLD_NOW, &extinfo);
ASSERT_TRUE(handle1 == nullptr);
ASSERT_STREQ("dlopen failed: library \"libnstest_public.so\" not found", dlerror());
ASSERT_MATCH(
dlerror(),
R"(dlopen failed: library "libnstest_public.so" not found: needed by \S+libnstest_root.so)"
R"( in namespace isolated2)");
}
TEST(dlext, ns_inaccessible_error_message) {