Merge "Hide the __bionic_clone and __bionic_clone_entry implementation details."
diff --git a/libm/include/math.h b/libm/include/math.h
index 4d174f9..c264583 100644
--- a/libm/include/math.h
+++ b/libm/include/math.h
@@ -457,6 +457,13 @@
long double truncl(long double);
#endif /* __ISO_C_VISIBLE >= 1999 */
+
+#if defined(_GNU_SOURCE)
+void sincos(double, double*, double*);
+void sincosf(float, float*, float*);
+void sincosl(long double, long double*, long double*);
+#endif /* _GNU_SOURCE */
+
__END_DECLS
#endif /* !_MATH_H_ */
diff --git a/tests/Android.mk b/tests/Android.mk
index 785a9f1..10e288c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -212,6 +212,19 @@
build_target := SHARED_LIBRARY
include $(LOCAL_PATH)/Android.build.mk
+# -----------------------------------------------------------------------------
+# create symlink to libdlext_test.so for symlink test
+# -----------------------------------------------------------------------------
+libdlext_origin := $(LOCAL_INSTALLED_MODULE)
+libdlext_sym := $(subst libdlext_test,libdlext_test_v2,$(libdlext_origin))
+$(libdlext_sym): $(libdlext_origin)
+ @echo "Symlink: $@ -> $(notdir $<)"
+ @mkdir -p $(dir $@)
+ $(hide) ln -sf $(notdir $<) $@
+
+ALL_MODULES := \
+ $(ALL_MODULES) $(libdlext_sym)
+
libdlext_test_norelro_src_files := \
dlext_test_library.cpp \
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index fc90dd9..1fdecdb 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -242,3 +242,11 @@
void* addr = dlsym(RTLD_NEXT, "fopen");
ASSERT_TRUE(addr != NULL);
}
+
+TEST(dlfcn, dlopen_symlink) {
+ void* handle1 = dlopen("libdlext_test.so", RTLD_NOW);
+ void* handle2 = dlopen("libdlext_test_v2.so", RTLD_NOW);
+ ASSERT_TRUE(handle1 != NULL);
+ ASSERT_TRUE(handle2 != NULL);
+ ASSERT_EQ(handle1, handle2);
+}