Add RTLD_NOLOAD support and some related changes.
* Aligned RTLD_ values with glibc for lp64
* dlopen supports RTLD_NOLOAD flag
* soinfo_unload calls find_library(.., RTLD_NOLOAD)
instead of naive find_loaded_library_by_name()
* dlopen changed to add child to caller soinfo instead
of somain.
Bug: https://code.google.com/p/android/issues/detail?id=64069
Change-Id: I1a65f2c34f3e0edc6d2c41a2e408b58195feb640
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 3b3c0f6..434e38f 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -50,6 +50,18 @@
ASSERT_EQ(0, dlclose(self));
}
+TEST(dlfcn, dlopen_noload) {
+ void* handle = dlopen("libtest_simple.so", RTLD_NOW | RTLD_NOLOAD);
+ ASSERT_TRUE(handle == NULL);
+ handle = dlopen("libtest_simple.so", RTLD_NOW);
+ void* handle2 = dlopen("libtest_simple.so", RTLD_NOW | RTLD_NOLOAD);
+ ASSERT_TRUE(handle != NULL);
+ ASSERT_TRUE(handle2 != NULL);
+ ASSERT_TRUE(handle == handle2);
+ ASSERT_EQ(0, dlclose(handle));
+ ASSERT_EQ(0, dlclose(handle2));
+}
+
TEST(dlfcn, dlopen_failure) {
void* self = dlopen("/does/not/exist", RTLD_NOW);
ASSERT_TRUE(self == NULL);