aboutsummaryrefslogtreecommitdiffstats
path: root/libc/Android.mk
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2015-04-24 03:49:30 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-24 03:49:30 +0000
commit6c63ee41ac5a246fb46c51753cd4d50ccae0dd8f (patch)
tree3ed0595fe98662464ea1ad7d6d5e75af9ff851b5 /libc/Android.mk
parent41ebceaf3ad392b4a3f40d96d5750d95ef206546 (diff)
parent094f58fb2a57d1ed5736ae3588bf0355618f915b (diff)
downloadandroid_bionic-6c63ee41ac5a246fb46c51753cd4d50ccae0dd8f.tar.gz
android_bionic-6c63ee41ac5a246fb46c51753cd4d50ccae0dd8f.tar.bz2
android_bionic-6c63ee41ac5a246fb46c51753cd4d50ccae0dd8f.zip
Merge "Revert "Unregister pthread_atfork handlers on dlclose()""
Diffstat (limited to 'libc/Android.mk')
-rw-r--r--libc/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/Android.mk b/libc/Android.mk
index 7a8c34449..2175dc48b 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -63,7 +63,6 @@ libc_common_src_files := \
stdio/sprintf.c \
stdio/stdio.c \
stdio/stdio_ext.cpp \
- stdlib/atexit.c \
stdlib/exit.c \
# Fortify implementations of libc functions.
@@ -483,6 +482,7 @@ libc_upstream_openbsd_ndk_src_files := \
upstream-openbsd/lib/libc/stdio/wprintf.c \
upstream-openbsd/lib/libc/stdio/wscanf.c \
upstream-openbsd/lib/libc/stdio/wsetup.c \
+ upstream-openbsd/lib/libc/stdlib/atexit.c \
upstream-openbsd/lib/libc/stdlib/atoi.c \
upstream-openbsd/lib/libc/stdlib/atol.c \
upstream-openbsd/lib/libc/stdlib/atoll.c \