diff --git a/libc/Android.mk b/libc/Android.mk
index 2c35ff3b52dac896e6990b06adad107ceaf9bef5..25de501f549e1b9d6cfd147ed502bbef30830c8e 100644 (file)
--- a/libc/Android.mk
+++ b/libc/Android.mk
# Define the common source files for all the libc instances
# =========================================================
libc_common_src_files := \
- unistd/alarm.c \
- unistd/exec.c \
- unistd/fnmatch.c \
- unistd/syslog.c \
- unistd/system.c \
- unistd/time.c \
- stdio/asprintf.c \
- stdio/fflush.c \
- stdio/fgetc.c \
- stdio/findfp.c \
- stdio/fprintf.c \
- stdio/fputc.c \
- stdio/fread.c \
- stdio/freopen.c \
- stdio/fscanf.c \
- stdio/fseek.c \
- stdio/ftell.c \
- stdio/fvwrite.c \
- stdio/gets.c \
- stdio/printf.c \
- stdio/refill.c \
- stdio/rewind.c \
- stdio/scanf.c \
- stdio/snprintf.c\
- stdio/sprintf.c \
- stdio/sscanf.c \
- stdio/stdio.c \
- stdio/ungetc.c \
- stdio/vasprintf.c \
- stdio/vfprintf.c \
- stdio/vfscanf.c \
- stdio/vprintf.c \
- stdio/vsnprintf.c \
- stdio/vsprintf.c \
- stdio/vscanf.c \
- stdio/vsscanf.c \
- stdio/wbuf.c \
- stdlib/atexit.c \
- stdlib/ctype_.c \
- stdlib/getenv.c \
- stdlib/putenv.c \
- stdlib/setenv.c \
- stdlib/strtod.c \
- stdlib/strtoimax.c \
- stdlib/strtol.c \
- stdlib/strtoll.c \
- stdlib/strtoul.c \
- stdlib/strtoull.c \
- stdlib/strtoumax.c \
- stdlib/tolower_.c \
- stdlib/toupper_.c \
- string/strcasecmp.c \
- string/strcspn.c \
- string/strdup.c \
- string/strpbrk.c \
- string/strsep.c \
- string/strspn.c \
- string/strstr.c \
- string/strtok.c \
- wchar/wcswidth.c \
- wchar/wcsxfrm.c \
- bionic/arc4random.c \
- bionic/atoi.c \
- bionic/atol.c \
- bionic/atoll.c \
- bionic/bindresvport.c \
- bionic/clearenv.c \
- bionic/daemon.c \
- bionic/err.c \
- bionic/ether_aton.c \
- bionic/ether_ntoa.c \
- bionic/fdprintf.c \
- bionic/flockfile.c \
- bionic/ftime.c \
- bionic/ftok.c \
- bionic/fts.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/md5.c \
- bionic/memmem.c \
- bionic/memswap.c \
- bionic/name_mem.c \
- bionic/pathconf.c \
- bionic/perror.c \
- bionic/ptsname.c \
- bionic/ptsname_r.c \
- bionic/pututline.c \
- bionic/reboot.c \
- bionic/recv.c \
- bionic/sched_cpualloc.c \
- bionic/sched_cpucount.c \
- bionic/semaphore.c \
- bionic/send.c \
- bionic/setpgrp.c \
- bionic/sigblock.c \
- bionic/siginterrupt.c \
- bionic/siglist.c \
- bionic/signame.c \
- bionic/sigsetmask.c \
- bionic/strndup.c \
- bionic/strntoimax.c \
- bionic/strntoumax.c \
- bionic/strtotimeval.c \
- bionic/system_properties.c \
- bionic/system_properties_compat.c \
- bionic/tcgetpgrp.c \
- bionic/tcsetpgrp.c \
- bionic/time64.c \
- bionic/umount.c \
- bionic/unlockpt.c \
- bionic/utmp.c \
- bionic/wcscoll.c \
-
-
-libc_dns_src_files += \
- netbsd/gethnamaddr.c \
- netbsd/inet/nsap_addr.c \
- netbsd/nameser/ns_name.c \
- netbsd/nameser/ns_netint.c \
- netbsd/nameser/ns_parse.c \
- netbsd/nameser/ns_print.c \
- netbsd/nameser/ns_samedomain.c \
- netbsd/nameser/ns_ttl.c \
- netbsd/net/base64.c \
- netbsd/net/getaddrinfo.c \
- netbsd/net/getnameinfo.c \
- netbsd/net/getservbyname.c \
- netbsd/net/getservbyport.c \
- netbsd/net/getservent.c \
- netbsd/net/nsdispatch.c \
- netbsd/resolv/__dn_comp.c \
- netbsd/resolv/herror.c \
- netbsd/resolv/res_cache.c \
- netbsd/resolv/__res_close.c \
- netbsd/resolv/res_comp.c \
- netbsd/resolv/res_data.c \
- netbsd/resolv/res_debug.c \
- netbsd/resolv/res_init.c \
- netbsd/resolv/res_mkquery.c \
- netbsd/resolv/res_query.c \
- netbsd/resolv/__res_send.c \
- netbsd/resolv/res_send.c \
- netbsd/resolv/res_state.c \
-
+ bionic/arc4random.c \
+ bionic/bindresvport.c \
+ bionic/clearenv.c \
+ bionic/daemon.c \
+ bionic/err.c \
+ bionic/ether_aton.c \
+ bionic/ether_ntoa.c \
+ bionic/fdprintf.c \
+ bionic/ftime.c \
+ bionic/fts.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/md5.c \
+ bionic/memmem.c \
+ bionic/memswap.c \
+ bionic/pathconf.c \
+ bionic/ptsname.c \
+ bionic/ptsname_r.c \
+ bionic/pututline.c \
+ bionic/recv.c \
+ bionic/sched_cpualloc.c \
+ bionic/sched_cpucount.c \
+ bionic/semaphore.c \
+ bionic/send.c \
+ bionic/setpgrp.c \
+ bionic/sigblock.c \
+ bionic/siginterrupt.c \
+ bionic/sigsetmask.c \
+ bionic/strntoimax.c \
+ bionic/strntoumax.c \
+ bionic/strtotimeval.c \
+ bionic/system_properties_compat.c \
+ bionic/tcgetpgrp.c \
+ bionic/tcsetpgrp.c \
+ bionic/time64.c \
+ bionic/umount.c \
+ bionic/unlockpt.c \
+ bionic/utmp.c \
+ bionic/wcscoll.c \
+ stdio/asprintf.c \
+ stdio/findfp.c \
+ stdio/fprintf.c \
+ stdio/fread.c \
+ stdio/freopen.c \
+ stdio/fvwrite.c \
+ stdio/snprintf.c\
+ stdio/sprintf.c \
+ stdio/sscanf.c \
+ stdio/vfprintf.c \
+ stdio/vfscanf.c \
+ stdio/vsscanf.c \
+ stdlib/atexit.c \
+ stdlib/ctype_.c \
+ stdlib/getenv.c \
+ stdlib/putenv.c \
+ stdlib/setenv.c \
+ stdlib/strtod.c \
+ unistd/syslog.c \
+ unistd/time.c \
# Fortify implementations of libc functions.
libc_common_src_files += \
bionic/abort.cpp \
bionic/access.cpp \
bionic/assert.cpp \
+ bionic/__bionic_name_mem.cpp \
bionic/bionic_time_conversions.cpp \
bionic/brk.cpp \
bionic/chmod.cpp \
bionic/dirent.cpp \
bionic/dup2.cpp \
bionic/epoll_create.cpp \
- bionic/epoll_wait.cpp \
bionic/epoll_pwait.cpp \
+ bionic/epoll_wait.cpp \
bionic/__errno.cpp \
bionic/eventfd_read.cpp \
bionic/eventfd_write.cpp \
bionic/ffs.cpp \
+ bionic/flockfile.cpp \
bionic/fork.cpp \
bionic/futimens.cpp \
bionic/getauxval.cpp \
bionic/getcwd.cpp \
bionic/inotify_init.cpp \
bionic/lchown.cpp \
+ bionic/lfs64_support.cpp \
bionic/libc_init_common.cpp \
bionic/libc_logging.cpp \
bionic/libgen.cpp \
bionic/ptrace.cpp \
bionic/raise.cpp \
bionic/readlink.cpp \
+ bionic/reboot.cpp \
bionic/rename.cpp \
bionic/rmdir.cpp \
bionic/sbrk.cpp \
bionic/__set_errno.cpp \
bionic/seteuid.cpp \
bionic/setlocale.cpp \
- bionic/signalfd.cpp \
bionic/sigaction.cpp \
bionic/sigaddset.cpp \
bionic/sigdelset.cpp \
bionic/sigfillset.cpp \
bionic/sigismember.cpp \
bionic/signal.cpp \
+ bionic/signalfd.cpp \
bionic/sigpending.cpp \
bionic/sigprocmask.cpp \
bionic/sigsuspend.cpp \
bionic/stubs.cpp \
bionic/symlink.cpp \
bionic/sysconf.cpp \
- bionic/thread_atexit.cpp \
+ bionic/system_properties.cpp \
+ bionic/sys_siglist.c \
+ bionic/sys_signame.c \
bionic/tdestroy.cpp \
+ bionic/thread_atexit.cpp \
bionic/timer.cpp \
bionic/tmpfile.cpp \
bionic/unlink.cpp \
bionic/wait.cpp \
bionic/wchar.cpp \
-
libc_upstream_freebsd_src_files := \
upstream-freebsd/lib/libc/gen/sleep.c \
upstream-freebsd/lib/libc/gen/usleep.c \
- 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/makebuf.c \
upstream-freebsd/lib/libc/stdio/mktemp.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/setvbuf.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/abs.c \
upstream-freebsd/lib/libc/stdlib/getopt_long.c \
upstream-freebsd/lib/libc/string/wcscspn.c \
upstream-freebsd/lib/libc/string/wcsdup.c \
upstream-freebsd/lib/libc/string/wcslcat.c \
- upstream-freebsd/lib/libc/string/wcslcpy.c \
upstream-freebsd/lib/libc/string/wcsncasecmp.c \
upstream-freebsd/lib/libc/string/wcsncat.c \
upstream-freebsd/lib/libc/string/wcsncmp.c \
libc_upstream_netbsd_src_files := \
upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \
upstream-netbsd/common/lib/libc/inet/inet_addr.c \
- upstream-netbsd/libc/compat-43/creat.c \
- upstream-netbsd/libc/gen/ftw.c \
- upstream-netbsd/libc/gen/nftw.c \
- upstream-netbsd/libc/gen/nice.c \
- upstream-netbsd/libc/gen/popen.c \
- upstream-netbsd/libc/gen/psignal.c \
- upstream-netbsd/libc/gen/setjmperr.c \
- upstream-netbsd/libc/gen/utime.c \
- upstream-netbsd/libc/inet/inet_ntoa.c \
- upstream-netbsd/libc/inet/inet_ntop.c \
- upstream-netbsd/libc/inet/inet_pton.c \
- upstream-netbsd/libc/isc/ev_streams.c \
- upstream-netbsd/libc/isc/ev_timers.c \
- upstream-netbsd/libc/regex/regcomp.c \
- upstream-netbsd/libc/regex/regerror.c \
- upstream-netbsd/libc/regex/regexec.c \
- upstream-netbsd/libc/regex/regfree.c \
- upstream-netbsd/libc/stdio/getdelim.c \
- upstream-netbsd/libc/stdio/getline.c \
- upstream-netbsd/libc/stdlib/bsearch.c \
- upstream-netbsd/libc/stdlib/div.c \
- upstream-netbsd/libc/stdlib/drand48.c \
- upstream-netbsd/libc/stdlib/erand48.c \
- upstream-netbsd/libc/stdlib/exit.c \
- upstream-netbsd/libc/stdlib/jrand48.c \
- upstream-netbsd/libc/stdlib/ldiv.c \
- upstream-netbsd/libc/stdlib/lldiv.c \
- upstream-netbsd/libc/stdlib/lrand48.c \
- upstream-netbsd/libc/stdlib/mrand48.c \
- upstream-netbsd/libc/stdlib/nrand48.c \
- upstream-netbsd/libc/stdlib/_rand48.c \
- upstream-netbsd/libc/stdlib/seed48.c \
- upstream-netbsd/libc/stdlib/srand48.c \
- upstream-netbsd/libc/stdlib/tdelete.c \
- upstream-netbsd/libc/stdlib/tfind.c \
- upstream-netbsd/libc/stdlib/tsearch.c \
- upstream-netbsd/libc/string/memccpy.c \
- upstream-netbsd/libc/string/strcasestr.c \
- upstream-netbsd/libc/string/strcoll.c \
- upstream-netbsd/libc/string/strxfrm.c \
- upstream-netbsd/libc/thread-stub/__isthreaded.c \
- upstream-netbsd/libc/unistd/killpg.c \
+ upstream-netbsd/lib/libc/gen/ftw.c \
+ upstream-netbsd/lib/libc/gen/nftw.c \
+ upstream-netbsd/lib/libc/gen/nice.c \
+ upstream-netbsd/lib/libc/gen/popen.c \
+ upstream-netbsd/lib/libc/gen/psignal.c \
+ upstream-netbsd/lib/libc/gen/setjmperr.c \
+ upstream-netbsd/lib/libc/gen/utime.c \
+ upstream-netbsd/lib/libc/inet/inet_ntoa.c \
+ upstream-netbsd/lib/libc/inet/inet_ntop.c \
+ upstream-netbsd/lib/libc/inet/inet_pton.c \
+ upstream-netbsd/lib/libc/isc/ev_streams.c \
+ upstream-netbsd/lib/libc/isc/ev_timers.c \
+ upstream-netbsd/lib/libc/regex/regcomp.c \
+ upstream-netbsd/lib/libc/regex/regerror.c \
+ upstream-netbsd/lib/libc/regex/regexec.c \
+ upstream-netbsd/lib/libc/regex/regfree.c \
+ upstream-netbsd/lib/libc/stdlib/bsearch.c \
+ upstream-netbsd/lib/libc/stdlib/div.c \
+ upstream-netbsd/lib/libc/stdlib/drand48.c \
+ upstream-netbsd/lib/libc/stdlib/erand48.c \
+ upstream-netbsd/lib/libc/stdlib/exit.c \
+ upstream-netbsd/lib/libc/stdlib/jrand48.c \
+ upstream-netbsd/lib/libc/stdlib/ldiv.c \
+ upstream-netbsd/lib/libc/stdlib/lldiv.c \
+ upstream-netbsd/lib/libc/stdlib/lrand48.c \
+ upstream-netbsd/lib/libc/stdlib/mrand48.c \
+ upstream-netbsd/lib/libc/stdlib/nrand48.c \
+ upstream-netbsd/lib/libc/stdlib/_rand48.c \
+ upstream-netbsd/lib/libc/stdlib/seed48.c \
+ upstream-netbsd/lib/libc/stdlib/srand48.c \
+ upstream-netbsd/lib/libc/stdlib/tdelete.c \
+ upstream-netbsd/lib/libc/stdlib/tfind.c \
+ upstream-netbsd/lib/libc/stdlib/tsearch.c \
+ upstream-netbsd/lib/libc/string/memccpy.c \
+ upstream-netbsd/lib/libc/string/strcasestr.c \
+ upstream-netbsd/lib/libc/string/strcoll.c \
+ upstream-netbsd/lib/libc/string/strxfrm.c \
+ upstream-netbsd/lib/libc/thread-stub/__isthreaded.c \
+ upstream-netbsd/lib/libc/unistd/killpg.c \
+
+libc_upstream_openbsd_src_files := \
+ upstream-openbsd/lib/libc/gen/alarm.c \
+ upstream-openbsd/lib/libc/gen/exec.c \
+ upstream-openbsd/lib/libc/gen/fnmatch.c \
+ upstream-openbsd/lib/libc/gen/ftok.c \
+ upstream-openbsd/lib/libc/gen/getprogname.c \
+ upstream-openbsd/lib/libc/gen/setprogname.c \
+ upstream-openbsd/lib/libc/gen/tolower_.c \
+ upstream-openbsd/lib/libc/gen/toupper_.c \
+ upstream-openbsd/lib/libc/string/strstr.c \
+ upstream-openbsd/lib/libc/string/strsep.c \
+ upstream-openbsd/lib/libc/string/wcslcpy.c \
+ upstream-openbsd/lib/libc/string/strcasecmp.c \
+ upstream-openbsd/lib/libc/string/strdup.c \
+ upstream-openbsd/lib/libc/string/strcspn.c \
+ upstream-openbsd/lib/libc/string/strtok.c \
+ upstream-openbsd/lib/libc/string/strpbrk.c \
+ upstream-openbsd/lib/libc/string/strspn.c \
+ upstream-openbsd/lib/libc/string/wcswidth.c \
+ upstream-openbsd/lib/libc/string/strndup.c \
+ upstream-openbsd/lib/libc/stdio/ungetc.c \
+ upstream-openbsd/lib/libc/stdio/vsnprintf.c \
+ upstream-openbsd/lib/libc/stdio/tmpnam.c \
+ upstream-openbsd/lib/libc/stdio/setbuffer.c \
+ upstream-openbsd/lib/libc/stdio/fsetpos.c \
+ upstream-openbsd/lib/libc/stdio/setbuf.c \
+ upstream-openbsd/lib/libc/stdio/vprintf.c \
+ upstream-openbsd/lib/libc/stdio/perror.c \
+ upstream-openbsd/lib/libc/stdio/remove.c \
+ upstream-openbsd/lib/libc/stdio/getc.c \
+ upstream-openbsd/lib/libc/stdio/funopen.c \
+ upstream-openbsd/lib/libc/stdio/ferror.c \
+ upstream-openbsd/lib/libc/stdio/putchar.c \
+ upstream-openbsd/lib/libc/stdio/vscanf.c \
+ upstream-openbsd/lib/libc/stdio/fflush.c \
+ upstream-openbsd/lib/libc/stdio/fpurge.c \
+ upstream-openbsd/lib/libc/stdio/fputs.c \
+ upstream-openbsd/lib/libc/stdio/tempnam.c \
+ upstream-openbsd/lib/libc/stdio/printf.c \
+ upstream-openbsd/lib/libc/stdio/fileno.c \
+ upstream-openbsd/lib/libc/stdio/stdio.c \
+ upstream-openbsd/lib/libc/stdio/getdelim.c \
+ upstream-openbsd/lib/libc/stdio/fseek.c \
+ upstream-openbsd/lib/libc/stdio/fputc.c \
+ upstream-openbsd/lib/libc/stdio/fgetln.c \
+ upstream-openbsd/lib/libc/stdio/fdopen.c \
+ upstream-openbsd/lib/libc/stdio/fgets.c \
+ upstream-openbsd/lib/libc/stdio/fgetc.c \
+ upstream-openbsd/lib/libc/stdio/feof.c \
+ upstream-openbsd/lib/libc/stdio/vasprintf.c \
+ upstream-openbsd/lib/libc/stdio/refill.c \
+ upstream-openbsd/lib/libc/stdio/getline.c \
+ upstream-openbsd/lib/libc/stdio/rewind.c \
+ upstream-openbsd/lib/libc/stdio/wbuf.c \
+ upstream-openbsd/lib/libc/stdio/gets.c \
+ upstream-openbsd/lib/libc/stdio/fgetpos.c \
+ upstream-openbsd/lib/libc/stdio/fscanf.c \
+ upstream-openbsd/lib/libc/stdio/putc.c \
+ upstream-openbsd/lib/libc/stdio/vsprintf.c \
+ upstream-openbsd/lib/libc/stdio/rget.c \
+ upstream-openbsd/lib/libc/stdio/clrerr.c \
+ upstream-openbsd/lib/libc/stdio/scanf.c \
+ upstream-openbsd/lib/libc/stdio/puts.c \
+ upstream-openbsd/lib/libc/stdio/getchar.c \
+ upstream-openbsd/lib/libc/stdio/ftell.c \
+ upstream-openbsd/lib/libc/stdio/fwalk.c \
+ upstream-openbsd/lib/libc/stdlib/strtoul.c \
+ upstream-openbsd/lib/libc/stdlib/strtoull.c \
+ upstream-openbsd/lib/libc/stdlib/atoi.c \
+ upstream-openbsd/lib/libc/stdlib/atoll.c \
+ upstream-openbsd/lib/libc/stdlib/atol.c \
+ upstream-openbsd/lib/libc/stdlib/strtoimax.c \
+ upstream-openbsd/lib/libc/stdlib/strtoumax.c \
+ upstream-openbsd/lib/libc/stdlib/strtoll.c \
+ upstream-openbsd/lib/libc/stdlib/strtol.c \
+ upstream-openbsd/lib/libc/stdlib/system.c \
+ upstream-openbsd/lib/libc/locale/wcsxfrm.c \
libc_arch_static_src_files := \
bionic/dl_iterate_phdr_static.cpp \
# Define some common includes
# ========================================================
libc_common_c_includes := \
- $(LOCAL_PATH)/stdlib \
- $(LOCAL_PATH)/string \
- $(LOCAL_PATH)/stdio \
- external/safe-iop/include
+ $(LOCAL_PATH)/stdlib \
+ $(LOCAL_PATH)/string \
+ $(LOCAL_PATH)/stdio \
+ external/safe-iop/include
# ========================================================
# Add in the arch-specific flags.
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
- tzcode/asctime.c \
- tzcode/difftime.c \
- tzcode/localtime.c \
- tzcode/strftime.c \
- tzcode/strptime.c \
-
+LOCAL_SRC_FILES := $(call all-c-files-under,tzcode)
LOCAL_CFLAGS := \
$(libc_common_cflags) \
-DSTD_INSPIRED=1 \
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(libc_dns_src_files)
+LOCAL_SRC_FILES := $(call all-c-files-under,dns)
LOCAL_CFLAGS := \
$(libc_common_cflags) \
-DINET6 \
-I$(LOCAL_PATH)/private \
- -I$(LOCAL_PATH)/upstream-netbsd/libc/include # for NetBSD private headers
-
+ -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include # for NetBSD private headers
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
LOCAL_C_INCLUDES := $(libc_common_c_includes)
$(libc_common_cflags) \
-DPOSIX_MISTAKE \
-I$(LOCAL_PATH)/upstream-netbsd \
- -I$(LOCAL_PATH)/upstream-netbsd/libc/include \
+ -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include \
-include upstream-netbsd/netbsd-compat.h
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
include $(BUILD_STATIC_LIBRARY)
+# ========================================================
+# libc_openbsd.a - upstream OpenBSD C library code
+# ========================================================
+#
+# These files are built with the openbsd-compat.h header file
+# automatically included.
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(libc_upstream_openbsd_src_files)
+LOCAL_CFLAGS := \
+ $(libc_common_cflags) \
+ -I$(LOCAL_PATH)/upstream-openbsd \
+ -I$(LOCAL_PATH)/upstream-openbsd/lib/libc/include \
+ -include upstream-openbsd/openbsd-compat.h
+LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
+LOCAL_CPPFLAGS := $(libc_common_cppflags)
+LOCAL_C_INCLUDES := $(libc_common_c_includes)
+LOCAL_MODULE := libc_openbsd
+LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
+LOCAL_SYSTEM_SHARED_LIBRARIES :=
+
+$(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
+include $(BUILD_STATIC_LIBRARY)
+
+
# ========================================================
# libc_bionic.a - home-grown C library code
# ========================================================
# Since this code is experimental it is disabled by default.
LOCAL_CFLAGS += -DPTHREAD_DEBUG_ENABLED=false
+ifeq ($(TARGET_USES_LOGD),true)
+LOCAL_CFLAGS += -DTARGET_USES_LOGD
+endif
+
$(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_bionic_src_files))
include $(BUILD_STATIC_LIBRARY)
libc_dns \
libc_freebsd \
libc_netbsd \
+ libc_openbsd \
libc_syscalls \
libc_tzcode \
LOCAL_SYSTEM_SHARED_LIBRARIES :=
$(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
-$(eval $(call patch-up-arch-specific-flags,libc_arch_dynamic_src_files))
-$(eval $(call patch-up-arch-specific-flags,libc_static_common_src_files))
+$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_arch_dynamic_src_files))
+$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_static_common_src_files))
# special for arm
LOCAL_NO_CRT_arm := true
LOCAL_CFLAGS_arm += -DCRT_LEGACY_WORKAROUND