am 9e572ca4: Merge "Fix missing args."

* commit '9e572ca4163e42bcd053df2cb8557e4b61ad064d':
  Fix missing args.
This commit is contained in:
Ying Wang 2014-02-13 00:51:16 +00:00 committed by Android Git Automerger
commit 00956d039f

View File

@ -37,128 +37,128 @@ endif
# Define the common source files for all the libc instances # Define the common source files for all the libc instances
# ========================================================= # =========================================================
libc_common_src_files := \ libc_common_src_files := \
unistd/alarm.c \ unistd/alarm.c \
unistd/exec.c \ unistd/exec.c \
unistd/fnmatch.c \ unistd/fnmatch.c \
unistd/syslog.c \ unistd/syslog.c \
unistd/system.c \ unistd/system.c \
unistd/time.c \ unistd/time.c \
stdio/asprintf.c \ stdio/asprintf.c \
stdio/fflush.c \ stdio/fflush.c \
stdio/fgetc.c \ stdio/fgetc.c \
stdio/findfp.c \ stdio/findfp.c \
stdio/fprintf.c \ stdio/fprintf.c \
stdio/fputc.c \ stdio/fputc.c \
stdio/fread.c \ stdio/fread.c \
stdio/freopen.c \ stdio/freopen.c \
stdio/fscanf.c \ stdio/fscanf.c \
stdio/fseek.c \ stdio/fseek.c \
stdio/ftell.c \ stdio/ftell.c \
stdio/fvwrite.c \ stdio/fvwrite.c \
stdio/gets.c \ stdio/gets.c \
stdio/printf.c \ stdio/printf.c \
stdio/refill.c \ stdio/refill.c \
stdio/rewind.c \ stdio/rewind.c \
stdio/scanf.c \ stdio/scanf.c \
stdio/snprintf.c\ stdio/snprintf.c\
stdio/sprintf.c \ stdio/sprintf.c \
stdio/sscanf.c \ stdio/sscanf.c \
stdio/stdio.c \ stdio/stdio.c \
stdio/ungetc.c \ stdio/ungetc.c \
stdio/vasprintf.c \ stdio/vasprintf.c \
stdio/vfprintf.c \ stdio/vfprintf.c \
stdio/vfscanf.c \ stdio/vfscanf.c \
stdio/vprintf.c \ stdio/vprintf.c \
stdio/vsnprintf.c \ stdio/vsnprintf.c \
stdio/vsprintf.c \ stdio/vsprintf.c \
stdio/vscanf.c \ stdio/vscanf.c \
stdio/vsscanf.c \ stdio/vsscanf.c \
stdio/wbuf.c \ stdio/wbuf.c \
stdlib/atexit.c \ stdlib/atexit.c \
stdlib/ctype_.c \ stdlib/ctype_.c \
stdlib/getenv.c \ stdlib/getenv.c \
stdlib/putenv.c \ stdlib/putenv.c \
stdlib/setenv.c \ stdlib/setenv.c \
stdlib/strtod.c \ stdlib/strtod.c \
stdlib/strtoimax.c \ stdlib/strtoimax.c \
stdlib/strtol.c \ stdlib/strtol.c \
stdlib/strtoll.c \ stdlib/strtoll.c \
stdlib/strtoul.c \ stdlib/strtoul.c \
stdlib/strtoull.c \ stdlib/strtoull.c \
stdlib/strtoumax.c \ stdlib/strtoumax.c \
stdlib/tolower_.c \ stdlib/tolower_.c \
stdlib/toupper_.c \ stdlib/toupper_.c \
string/strcasecmp.c \ string/strcasecmp.c \
string/strcspn.c \ string/strcspn.c \
string/strdup.c \ string/strdup.c \
string/strpbrk.c \ string/strpbrk.c \
string/strsep.c \ string/strsep.c \
string/strspn.c \ string/strspn.c \
string/strstr.c \ string/strstr.c \
string/strtok.c \ string/strtok.c \
wchar/wcswidth.c \ wchar/wcswidth.c \
wchar/wcsxfrm.c \ wchar/wcsxfrm.c \
bionic/arc4random.c \ bionic/arc4random.c \
bionic/atoi.c \ bionic/atoi.c \
bionic/atol.c \ bionic/atol.c \
bionic/atoll.c \ bionic/atoll.c \
bionic/bindresvport.c \ bionic/bindresvport.c \
bionic/clearenv.c \ bionic/clearenv.c \
bionic/daemon.c \ bionic/daemon.c \
bionic/err.c \ bionic/err.c \
bionic/ether_aton.c \ bionic/ether_aton.c \
bionic/ether_ntoa.c \ bionic/ether_ntoa.c \
bionic/fdprintf.c \ bionic/fdprintf.c \
bionic/flockfile.c \ bionic/flockfile.c \
bionic/ftime.c \ bionic/ftime.c \
bionic/ftok.c \ bionic/ftok.c \
bionic/fts.c \ bionic/fts.c \
bionic/getdtablesize.c \ bionic/getdtablesize.c \
bionic/gethostname.c \ bionic/gethostname.c \
bionic/getpgrp.c \ bionic/getpgrp.c \
bionic/getpriority.c \ bionic/getpriority.c \
bionic/getpt.c \ bionic/getpt.c \
bionic/if_indextoname.c \ bionic/if_indextoname.c \
bionic/if_nametoindex.c \ bionic/if_nametoindex.c \
bionic/initgroups.c \ bionic/initgroups.c \
bionic/ioctl.c \ bionic/ioctl.c \
bionic/isatty.c \ bionic/isatty.c \
bionic/issetugid.c \ bionic/issetugid.c \
bionic/ldexp.c \ bionic/ldexp.c \
bionic/md5.c \ bionic/md5.c \
bionic/memmem.c \ bionic/memmem.c \
bionic/memswap.c \ bionic/memswap.c \
bionic/name_mem.c \ bionic/name_mem.c \
bionic/pathconf.c \ bionic/pathconf.c \
bionic/perror.c \ bionic/perror.c \
bionic/ptsname.c \ bionic/ptsname.c \
bionic/ptsname_r.c \ bionic/ptsname_r.c \
bionic/pututline.c \ bionic/pututline.c \
bionic/reboot.c \ bionic/reboot.c \
bionic/recv.c \ bionic/recv.c \
bionic/sched_cpualloc.c \ bionic/sched_cpualloc.c \
bionic/sched_cpucount.c \ bionic/sched_cpucount.c \
bionic/semaphore.c \ bionic/semaphore.c \
bionic/send.c \ bionic/send.c \
bionic/setpgrp.c \ bionic/setpgrp.c \
bionic/sigblock.c \ bionic/sigblock.c \
bionic/siginterrupt.c \ bionic/siginterrupt.c \
bionic/siglist.c \ bionic/siglist.c \
bionic/signame.c \ bionic/signame.c \
bionic/sigsetmask.c \ bionic/sigsetmask.c \
bionic/strndup.c \ bionic/strndup.c \
bionic/strntoimax.c \ bionic/strntoimax.c \
bionic/strntoumax.c \ bionic/strntoumax.c \
bionic/strtotimeval.c \ bionic/strtotimeval.c \
bionic/system_properties.c \ bionic/system_properties.c \
bionic/system_properties_compat.c \ bionic/system_properties_compat.c \
bionic/tcgetpgrp.c \ bionic/tcgetpgrp.c \
bionic/tcsetpgrp.c \ bionic/tcsetpgrp.c \
bionic/time64.c \ bionic/time64.c \
bionic/umount.c \ bionic/umount.c \
bionic/unlockpt.c \ bionic/unlockpt.c \
bionic/utmp.c \ bionic/utmp.c \
bionic/wcscoll.c \ bionic/wcscoll.c \
libc_dns_src_files += \ libc_dns_src_files += \
@ -466,10 +466,10 @@ libc_common_cppflags := \
# Define some common includes # Define some common includes
# ======================================================== # ========================================================
libc_common_c_includes := \ libc_common_c_includes := \
$(LOCAL_PATH)/stdlib \ $(LOCAL_PATH)/stdlib \
$(LOCAL_PATH)/string \ $(LOCAL_PATH)/string \
$(LOCAL_PATH)/stdio \ $(LOCAL_PATH)/stdio \
external/safe-iop/include external/safe-iop/include
# ======================================================== # ========================================================
# Add in the arch-specific flags. # Add in the arch-specific flags.
@ -785,8 +785,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
LOCAL_SYSTEM_SHARED_LIBRARIES := LOCAL_SYSTEM_SHARED_LIBRARIES :=
$(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) $(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,LOCAL_SRC_FILES,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_static_common_src_files))
# special for arm # special for arm
LOCAL_NO_CRT_arm := true LOCAL_NO_CRT_arm := true
LOCAL_CFLAGS_arm += -DCRT_LEGACY_WORKAROUND LOCAL_CFLAGS_arm += -DCRT_LEGACY_WORKAROUND