Merge "Restore libc __cxa_atexit symbol"
diff --git a/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt
index d211ffb..10c11ab 100644
--- a/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt
@@ -15,6 +15,7 @@
__cmsg_nxthdr
__connect
__ctype_get_mb_cur_max
+__cxa_atexit
__cxa_finalize
__divdf3
__divdi3
diff --git a/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt
index 5d45600..ed47c33 100644
--- a/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt
@@ -8,6 +8,7 @@
__b64_pton
__cmsg_nxthdr
__ctype_get_mb_cur_max
+__cxa_atexit
__cxa_finalize
__dn_comp
__dn_count_labels
diff --git a/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt
index 3266392..e7badff 100644
--- a/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt
@@ -10,6 +10,7 @@
__cmsg_nxthdr
__connect
__ctype_get_mb_cur_max
+__cxa_atexit
__cxa_finalize
__divdi3
__dn_comp
diff --git a/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt
index 5d45600..ed47c33 100644
--- a/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt
@@ -8,6 +8,7 @@
__b64_pton
__cmsg_nxthdr
__ctype_get_mb_cur_max
+__cxa_atexit
__cxa_finalize
__dn_comp
__dn_count_labels
diff --git a/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt
index 73a4eb1..7d77659 100644
--- a/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt
@@ -10,6 +10,7 @@
__cmsg_nxthdr
__connect
__ctype_get_mb_cur_max
+__cxa_atexit
__cxa_finalize
__divdi3
__dn_comp
diff --git a/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt
index 5d45600..ed47c33 100644
--- a/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt
@@ -8,6 +8,7 @@
__b64_pton
__cmsg_nxthdr
__ctype_get_mb_cur_max
+__cxa_atexit
__cxa_finalize
__dn_comp
__dn_count_labels