Move non-upstream code into the libc/bionic directory.
I'll need at least one more pass, because there's some upstream code
lurking in libc/bionic, but this is still a step in the right direction.
Change-Id: I55927315972da8327ae01c5240ed587db17e8462
diff --git a/libc/Android.mk b/libc/Android.mk
index f1bfd71..73b8acb 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -8,68 +8,14 @@
$(syscall_src) \
unistd/abort.c \
unistd/alarm.c \
- unistd/brk.c \
- unistd/daemon.c \
- unistd/eventfd.c \
unistd/exec.c \
- unistd/fcntl.c \
unistd/fnmatch.c \
- unistd/fstatfs.c \
- unistd/ftime.c \
- unistd/ftok.c \
- unistd/getdtablesize.c \
- unistd/gethostname.c \
unistd/getopt_long.c \
- unistd/getpgrp.c \
- unistd/getpriority.c \
- unistd/getpt.c \
- unistd/initgroups.c \
- unistd/isatty.c \
- unistd/issetugid.c \
unistd/killpg.c \
- unistd/lseek64.c \
- unistd/mmap.c \
- unistd/open.c \
- unistd/openat.c \
- unistd/opendir.c \
- unistd/pathconf.c \
- unistd/perror.c \
unistd/popen.c \
- unistd/pread.c \
- unistd/pselect.c \
- unistd/ptsname.c \
- unistd/ptsname_r.c \
- unistd/pwrite.c \
- unistd/raise.c \
- unistd/reboot.c \
- unistd/recv.c \
- unistd/sbrk.c \
- unistd/send.c \
- unistd/setegid.c \
- unistd/setuid.c \
- unistd/seteuid.c \
- unistd/setreuid.c \
- unistd/setresuid.c \
- unistd/setpgrp.c \
- unistd/sigblock.c \
- unistd/siginterrupt.c \
- unistd/siglist.c \
- unistd/signal.c \
- unistd/signame.c \
- unistd/sigsetmask.c \
- unistd/sigsuspend.c \
- unistd/sigwait.c \
- unistd/sleep.c \
- unistd/statfs.c \
unistd/syslog.c \
unistd/system.c \
- unistd/tcgetpgrp.c \
- unistd/tcsetpgrp.c \
unistd/time.c \
- unistd/umount.c \
- unistd/unlockpt.c \
- unistd/usleep.c \
- unistd/wait.c \
stdio/asprintf.c \
stdio/clrerr.c \
stdio/fclose.c \
@@ -84,7 +30,6 @@
stdio/fileno.c \
stdio/findfp.c \
stdio/flags.c \
- stdio/flockfile.c \
stdio/fopen.c \
stdio/fprintf.c \
stdio/fpurge.c \
@@ -135,16 +80,8 @@
stdio/vsscanf.c \
stdio/wbuf.c \
stdio/wsetup.c \
- stdio/__fgets_chk.c \
- stdio/__snprintf_chk.c \
- stdio/__sprintf_chk.c \
- stdio/__vsnprintf_chk.c \
- stdio/__vsprintf_chk.c \
stdlib/assert.c \
stdlib/atexit.c \
- stdlib/atoi.c \
- stdlib/atol.c \
- stdlib/atoll.c \
stdlib/bsearch.c \
stdlib/ctype_.c \
stdlib/div.c \
@@ -152,13 +89,10 @@
stdlib/getenv.c \
stdlib/ldiv.c \
stdlib/lldiv.c \
- stdlib/locale.c \
stdlib/putenv.c \
stdlib/qsort.c \
stdlib/setenv.c \
stdlib/setjmperr.c \
- stdlib/strntoimax.c \
- stdlib/strntoumax.c \
stdlib/strtod.c \
stdlib/strtoimax.c \
stdlib/strtol.c \
@@ -168,50 +102,29 @@
stdlib/strtoumax.c \
stdlib/tolower_.c \
stdlib/toupper_.c \
- stdlib/wchar.c \
string/index.c \
- string/memccpy.c \
- string/memchr.c \
- string/memmem.c \
- string/memrchr.c \
- string/memswap.c \
string/strcasecmp.c \
string/strcasestr.c \
string/strcat.c \
string/strchr.c \
- string/strcoll.c \
string/strcspn.c \
string/strdup.c \
string/strlcat.c \
string/strlcpy.c \
string/strncat.c \
string/strncpy.c \
- string/strndup.c \
- string/strnlen.c \
string/strpbrk.c \
string/strrchr.c \
string/strsep.c \
string/strspn.c \
string/strstr.c \
string/strtok.c \
- string/strtotimeval.c \
- string/__memcpy_chk.c \
- string/__memmove_chk.c \
- string/__memset_chk.c \
- string/__strcat_chk.c \
- string/__strcpy_chk.c \
- string/__strlcat_chk.c \
- string/__strlcpy_chk.c \
- string/__strlen_chk.c \
- string/__strncat_chk.c \
- string/__strncpy_chk.c \
wchar/wcpcpy.c \
wchar/wcpncpy.c \
wchar/wcscasecmp.c \
wchar/wcscat.c \
wchar/wcschr.c \
wchar/wcscmp.c \
- wchar/wcscoll.c \
wchar/wcscpy.c \
wchar/wcscspn.c \
wchar/wcsdup.c \
@@ -235,61 +148,148 @@
wchar/wmemcpy.c \
wchar/wmemmove.c \
wchar/wmemset.c \
- inet/bindresvport.c \
inet/inet_addr.c \
inet/inet_aton.c \
inet/inet_ntoa.c \
inet/inet_ntop.c \
inet/inet_pton.c \
- inet/ether_aton.c \
- inet/ether_ntoa.c \
tzcode/asctime.c \
tzcode/difftime.c \
tzcode/localtime.c \
tzcode/strftime.c \
tzcode/strptime.c \
- bionic/__set_errno.c \
- bionic/__umask_chk.c \
- bionic/bionic_clone.c \
- bionic/cpuacct.c \
bionic/arc4random.c \
+ bionic/atoi.c \
+ bionic/atol.c \
+ bionic/atoll.c \
bionic/basename.c \
bionic/basename_r.c \
+ bionic/bindresvport.c \
+ bionic/bionic_clone.c \
+ bionic/brk.c \
bionic/clearenv.c \
+ bionic/cpuacct.c \
+ bionic/daemon.c \
bionic/dirname.c \
bionic/dirname_r.c \
bionic/err.c \
+ bionic/ether_aton.c \
+ bionic/ether_ntoa.c \
+ bionic/eventfd.c \
+ bionic/fcntl.c \
bionic/fdprintf.c \
+ bionic/__fgets_chk.c \
+ bionic/flockfile.c \
bionic/fork.c \
+ bionic/fstatfs.c \
+ bionic/ftime.c \
+ bionic/ftok.c \
bionic/fts.c \
bionic/getcwd.cpp \
- bionic/if_nametoindex.c \
+ bionic/getdtablesize.c \
+ bionic/gethostname.c \
+ bionic/getpgrp.c \
+ bionic/getpriority.c \
+ bionic/getpt.c \
bionic/if_indextoname.c \
+ bionic/if_nametoindex.c \
+ bionic/initgroups.c \
bionic/ioctl.c \
+ bionic/isatty.c \
+ bionic/issetugid.c \
bionic/ldexp.c \
bionic/libc_init_common.c \
+ bionic/locale.c \
bionic/logd_write.c \
+ bionic/lseek64.c \
bionic/md5.c \
+ bionic/memccpy.c \
+ bionic/memchr.c \
+ bionic/__memcpy_chk.c \
+ bionic/memmem.c \
+ bionic/__memmove_chk.c \
bionic/memmove_words.c \
+ bionic/memrchr.c \
+ bionic/__memset_chk.c \
+ bionic/memswap.c \
+ bionic/mmap.c \
+ bionic/openat.c \
+ bionic/open.c \
+ bionic/opendir.c \
+ bionic/pathconf.c \
+ bionic/perror.c \
+ bionic/pread.c \
+ bionic/pselect.c \
+ bionic/ptsname.c \
+ bionic/ptsname_r.c \
bionic/pututline.c \
+ bionic/pwrite.c \
+ bionic/raise.c \
bionic/realpath.c \
- bionic/sched_getaffinity.c \
- bionic/sched_getcpu.c \
+ bionic/reboot.c \
+ bionic/recv.c \
+ bionic/sbrk.c \
bionic/sched_cpualloc.c \
bionic/sched_cpucount.c \
+ bionic/sched_getaffinity.c \
+ bionic/sched_getcpu.c \
bionic/semaphore.c \
+ bionic/send.c \
+ bionic/setegid.c \
+ bionic/__set_errno.c \
+ bionic/seteuid.c \
+ bionic/setpgrp.c \
+ bionic/setresuid.c \
+ bionic/setreuid.c \
+ bionic/setuid.c \
bionic/sha1.c \
+ bionic/sigblock.c \
+ bionic/siginterrupt.c \
+ bionic/siglist.c \
+ bionic/signal.c \
+ bionic/signame.c \
+ bionic/sigsetmask.c \
+ bionic/sigsuspend.c \
+ bionic/sigwait.c \
+ bionic/sleep.c \
+ bionic/__snprintf_chk.c \
+ bionic/__sprintf_chk.c \
+ bionic/statfs.c \
+ bionic/__strcat_chk.c \
+ bionic/strcoll.c \
+ bionic/__strcpy_chk.c \
bionic/strerror.cpp \
bionic/strerror_r.cpp \
+ bionic/__strlcat_chk.c \
+ bionic/__strlcpy_chk.c \
+ bionic/__strlen_chk.c \
+ bionic/__strncat_chk.c \
+ bionic/__strncpy_chk.c \
+ bionic/strndup.c \
+ bionic/strnlen.c \
+ bionic/strntoimax.c \
+ bionic/strntoumax.c \
bionic/strsignal.cpp \
+ bionic/strtotimeval.c \
bionic/stubs.cpp \
bionic/system_properties.c \
+ bionic/tcgetpgrp.c \
+ bionic/tcsetpgrp.c \
bionic/tdestroy.c \
- bionic/time64.c \
bionic/thread_atexit.c \
+ bionic/time64.c \
bionic/tmpfile.cpp \
+ bionic/__umask_chk.c \
+ bionic/umount.c \
+ bionic/unlockpt.c \
+ bionic/usleep.c \
bionic/utime.c \
bionic/utmp.c \
+ bionic/__vsnprintf_chk.c \
+ bionic/__vsprintf_chk.c \
+ bionic/wait.c \
+ bionic/wchar.c \
+ bionic/wcscoll.c \
netbsd/gethnamaddr.c \
netbsd/isc/ev_timers.c \
netbsd/isc/ev_streams.c \
@@ -361,40 +361,40 @@
# below.
#
libc_static_common_src_files := \
- unistd/sysconf.c \
bionic/__errno.c \
+ bionic/sysconf.c \
# Architecture specific source files go here
# =========================================================
ifeq ($(TARGET_ARCH),arm)
libc_common_src_files += \
- arch-arm/bionic/__get_sp.S \
- arch-arm/bionic/_exit_with_stack_teardown.S \
- arch-arm/bionic/_setjmp.S \
arch-arm/bionic/abort_arm.S \
arch-arm/bionic/atomics_arm.c \
arch-arm/bionic/clone.S \
arch-arm/bionic/eabi.c \
+ arch-arm/bionic/_exit_with_stack_teardown.S \
arch-arm/bionic/ffs.S \
arch-arm/bionic/futex_arm.S \
+ arch-arm/bionic/__get_sp.S \
arch-arm/bionic/kill.S \
arch-arm/bionic/libgcc_compat.c \
- arch-arm/bionic/tkill.S \
- arch-arm/bionic/tgkill.S \
- arch-arm/bionic/memcmp.S \
arch-arm/bionic/memcmp16.S \
+ arch-arm/bionic/memcmp.S \
arch-arm/bionic/memcpy.S \
arch-arm/bionic/memset.S \
+ arch-arm/bionic/_setjmp.S \
arch-arm/bionic/setjmp.S \
arch-arm/bionic/sigsetjmp.S \
- arch-arm/bionic/strlen.c.arm \
- arch-arm/bionic/strcpy.S \
arch-arm/bionic/strcmp.S \
+ arch-arm/bionic/strcpy.S \
+ arch-arm/bionic/strlen.c.arm \
arch-arm/bionic/syscall.S \
- string/memmove.c.arm \
+ arch-arm/bionic/tgkill.S \
+ arch-arm/bionic/tkill.S \
+ bionic/memmove.c.arm \
+ bionic/socketcalls.c \
string/bcopy.c \
string/strncmp.c \
- unistd/socketcalls.c
# These files need to be arm so that gdbserver
# can set breakpoints in them without messing