Start moving to current FreeBSD stdio.
This only touches the easy stuff.
Change-Id: Iecee57f1681dba5c56bff59f0e9a89811a71f0ca
diff --git a/libc/Android.mk b/libc/Android.mk
index 74175ba..40191ee 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -15,58 +15,29 @@
unistd/system.c \
unistd/time.c \
stdio/asprintf.c \
- stdio/clrerr.c \
- stdio/fclose.c \
- stdio/fdopen.c \
- stdio/feof.c \
- stdio/ferror.c \
stdio/fflush.c \
stdio/fgetc.c \
- stdio/fgetln.c \
- stdio/fgetpos.c \
- stdio/fgets.c \
- stdio/fileno.c \
stdio/findfp.c \
- stdio/flags.c \
- stdio/fopen.c \
stdio/fprintf.c \
- stdio/fpurge.c \
stdio/fputc.c \
- stdio/fputs.c \
stdio/fread.c \
stdio/freopen.c \
stdio/fscanf.c \
stdio/fseek.c \
- stdio/fsetpos.c \
stdio/ftell.c \
- stdio/funopen.c \
stdio/fvwrite.c \
- stdio/fwalk.c \
- stdio/fwrite.c \
- stdio/getc.c \
- stdio/getchar.c \
stdio/gets.c \
stdio/makebuf.c \
stdio/mktemp.c \
stdio/printf.c \
- stdio/putc.c \
- stdio/putchar.c \
- stdio/puts.c \
- stdio/putw.c \
stdio/refill.c \
- stdio/remove.c \
stdio/rewind.c \
- stdio/rget.c \
stdio/scanf.c \
- stdio/setbuf.c \
- stdio/setbuffer.c \
stdio/setvbuf.c \
stdio/snprintf.c\
stdio/sprintf.c \
stdio/sscanf.c \
stdio/stdio.c \
- stdio/tempnam.c \
- stdio/tmpnam.c \
stdio/ungetc.c \
stdio/vasprintf.c \
stdio/vfprintf.c \
@@ -77,7 +48,6 @@
stdio/vscanf.c \
stdio/vsscanf.c \
stdio/wbuf.c \
- stdio/wsetup.c \
stdlib/atexit.c \
stdlib/ctype_.c \
stdlib/exit.c \
@@ -289,6 +259,36 @@
bionic/wchar.cpp \
libc_upstream_freebsd_src_files := \
+ upstream-freebsd/lib/libc/stdio/clrerr.c \
+ upstream-freebsd/lib/libc/stdio/fclose.c \
+ upstream-freebsd/lib/libc/stdio/fdopen.c \
+ upstream-freebsd/lib/libc/stdio/feof.c \
+ upstream-freebsd/lib/libc/stdio/ferror.c \
+ upstream-freebsd/lib/libc/stdio/fgetln.c \
+ upstream-freebsd/lib/libc/stdio/fgetpos.c \
+ upstream-freebsd/lib/libc/stdio/fgets.c \
+ upstream-freebsd/lib/libc/stdio/fileno.c \
+ upstream-freebsd/lib/libc/stdio/flags.c \
+ upstream-freebsd/lib/libc/stdio/fopen.c \
+ upstream-freebsd/lib/libc/stdio/fpurge.c \
+ upstream-freebsd/lib/libc/stdio/fputs.c \
+ upstream-freebsd/lib/libc/stdio/fsetpos.c \
+ upstream-freebsd/lib/libc/stdio/funopen.c \
+ upstream-freebsd/lib/libc/stdio/fwalk.c \
+ upstream-freebsd/lib/libc/stdio/fwrite.c \
+ upstream-freebsd/lib/libc/stdio/getc.c \
+ upstream-freebsd/lib/libc/stdio/getchar.c \
+ upstream-freebsd/lib/libc/stdio/putc.c \
+ upstream-freebsd/lib/libc/stdio/putchar.c \
+ upstream-freebsd/lib/libc/stdio/puts.c \
+ upstream-freebsd/lib/libc/stdio/putw.c \
+ upstream-freebsd/lib/libc/stdio/remove.c \
+ upstream-freebsd/lib/libc/stdio/rget.c \
+ upstream-freebsd/lib/libc/stdio/setbuf.c \
+ upstream-freebsd/lib/libc/stdio/setbuffer.c \
+ upstream-freebsd/lib/libc/stdio/tempnam.c \
+ upstream-freebsd/lib/libc/stdio/tmpnam.c \
+ upstream-freebsd/lib/libc/stdio/wsetup.c \
upstream-freebsd/lib/libc/stdlib/realpath.c \
upstream-freebsd/lib/libc/string/wcpcpy.c \
upstream-freebsd/lib/libc/string/wcpncpy.c \