commit 163ab8ba86deb991c73152e6828f270cc71dc4c5
author Dmitriy Ivanov <dimitry@google.com> Wed Apr 15 15:31:51 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed Apr 15 16:24:21 2015 -0700
tree fdaf88cdc6ae4788a95f2f527e35fa869398397f
parent 8f3f04184a5772b421867b59acd3d0dfbc6fa4eb

Call __cxa_thread_finalize for the main thread.

Bug: http://b/20231984
Bug: http://b/16696563
Change-Id: I71cfddd0d404d1d4a593ec8d3bca9741de8cb90f

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index e632ee7..0dc3db7 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -63,6 +63,7 @@
     stdio/sprintf.c \
     stdio/stdio.c \
     stdio/stdio_ext.cpp \
+    stdlib/exit.c \
 
 # Fortify implementations of libc functions.
 libc_common_src_files += \
@@ -480,7 +481,6 @@
     upstream-openbsd/lib/libc/stdlib/atoi.c \
     upstream-openbsd/lib/libc/stdlib/atol.c \
     upstream-openbsd/lib/libc/stdlib/atoll.c \
-    upstream-openbsd/lib/libc/stdlib/exit.c \
     upstream-openbsd/lib/libc/stdlib/getenv.c \
     upstream-openbsd/lib/libc/stdlib/insque.c \
     upstream-openbsd/lib/libc/stdlib/lsearch.c \