Fixes for __cxa_finalize
* Ability to register atexit handler from atexit handler
* Correct way to handle both forms of atexit handler
Bug: https://code.google.com/p/android/issues/detail?id=66595
Bug: 4998315
Change-Id: I39529afaef97b6e1469c21389d54c0d7d175da28
diff --git a/tests/Android.mk b/tests/Android.mk
index fccf3f1..4e82591 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -210,6 +210,18 @@
include $(LOCAL_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
+# This library used by atexit tests
+# -----------------------------------------------------------------------------
+
+libtest_atexit_src_files := \
+ atexit_testlib.cpp
+
+module := libtest_atexit
+build_type := target
+build_target := SHARED_LIBRARY
+include $(LOCAL_PATH)/Android.build.mk
+
+# -----------------------------------------------------------------------------
# Tests for the device using bionic's .so. Run with:
# adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
# -----------------------------------------------------------------------------
@@ -217,6 +229,7 @@
libBionicTests \
bionic-unit-tests_src_files := \
+ atexit_test.cpp \
dlext_test.cpp \
dlfcn_test.cpp \
@@ -263,11 +276,14 @@
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
+bionic-unit-tests-glibc_src_files := \
+ atexit_test.cpp \
+
bionic-unit-tests-glibc_whole_static_libraries := \
libBionicStandardTests \
bionic-unit-tests-glibc_ldlibs := \
- -lrt \
+ -lrt -ldl \
module := bionic-unit-tests-glibc
module_tag := optional