am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"

* commit 'f22634e3b22590fde355143ea6c1437c713b7bee':
  Refresh 64-bit headers/libs (WW28)

ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt

@@ -34,6 +34,7 @@ ___Unwind_ForcedUnwind
 ___Unwind_RaiseException
 ___Unwind_Resume
 ___Unwind_Resume_or_Rethrow
+___mtctxres
 __accept4
 __adddf3
 __addsf3
@@ -112,6 +113,7 @@ __b64_pton
 __bionic_name_mem
 __brk
 __cmpdf2
+__cmsg_nxthdr
 __connect
 __cxa_atexit
 __cxa_finalize
@@ -160,6 +162,7 @@ __get_tls
 __getcpu
 __getcwd
 __getdents64
+__getpid
 __getpriority
 __gnu_Unwind_Backtrace
 __gnu_Unwind_Find_exidx
@@ -241,7 +244,9 @@ __read_chk
 __reboot
 __recvfrom_chk
 __res_close
+__res_disable_mt
 __res_dnok
+__res_enable_mt
 __res_hnok
 __res_hostalias
 __res_isourserver
@@ -334,6 +339,7 @@ _exit
 _getlong
 _getshort
 _longjmp
+_mktemp
 _resolv_flush_cache_for_net
 _resolv_set_nameservers_for_net
 _setjmp
@@ -353,9 +359,7 @@ android_getaddrinfofornet
 android_gethostbyaddrfornet
 android_gethostbynamefornet
 arc4random
-arc4random_addrandom
 arc4random_buf
-arc4random_stir
 arc4random_uniform
 asctime
 asctime64
@@ -629,6 +633,8 @@ inet_lnaof
 inet_makeaddr
 inet_netof
 inet_network
+inet_nsap_addr
+inet_nsap_ntoa
 inet_ntoa
 inet_ntop
 inet_pton
@@ -767,6 +773,7 @@ nftw
 nftw64
 nice
 nrand48
+nsdispatch
 ntohl
 ntohs
 open
@@ -1021,6 +1028,7 @@ sleep
 snprintf
 socket
 socketpair
+splice
 sprintf
 srand
 srand48
@@ -1105,6 +1113,7 @@ tcsetattr
 tcsetpgrp
 tdelete
 tdestroy
+tee
 tempnam
 tfind
 tgkill
@@ -1164,6 +1173,7 @@ vfprintf
 vfscanf
 vfwprintf
 vfwscanf
+vmsplice
 vprintf
 vscanf
 vsnprintf

ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt

@@ -1,26 +1,4 @@
-SHA1Final
-SHA1Init
-SHA1Transform
-SHA1Update
 _Exit
-_Unwind_Backtrace
-_Unwind_DeleteException
-_Unwind_FindEnclosingFunction
-_Unwind_Find_FDE
-_Unwind_ForcedUnwind
-_Unwind_GetCFA
-_Unwind_GetDataRelBase
-_Unwind_GetGR
-_Unwind_GetIP
-_Unwind_GetIPInfo
-_Unwind_GetLanguageSpecificData
-_Unwind_GetRegionStart
-_Unwind_GetTextRelBase
-_Unwind_RaiseException
-_Unwind_Resume
-_Unwind_Resume_or_Rethrow
-_Unwind_SetGR
-_Unwind_SetIP
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -32,21 +10,20 @@ _ZnwmRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
+___mtctxres
 __android_set_abort_message
 __assert
 __assert2
 __b64_ntop
 __b64_pton
 __bionic_name_mem
+__cmsg_nxthdr
 __cxa_atexit
 __cxa_finalize
 __cxa_guard_abort
 __cxa_guard_acquire
 __cxa_guard_release
 __cxa_pure_virtual
-__deregister_frame
-__deregister_frame_info
-__deregister_frame_info_bases
 __dn_comp
 __dn_count_labels
 __dn_skipname
@@ -59,7 +36,6 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__frame_state_for
 __get_h_errno
 __hostalias
 __isfinite
@@ -82,7 +58,6 @@ __loc_ntoa
 __memcpy_chk
 __memmove_chk
 __memset_chk
-__multf3
 __open_2
 __openat_2
 __p_cdname
@@ -96,7 +71,6 @@ __p_rcode
 __p_secstodate
 __p_time
 __p_type
-__popcountdi2
 __pthread_cleanup_pop
 __pthread_cleanup_push
 __pthread_gettid
@@ -104,14 +78,10 @@ __putlong
 __putshort
 __read_chk
 __recvfrom_chk
-__register_frame
-__register_frame_info
-__register_frame_info_bases
-__register_frame_info_table
-__register_frame_info_table_bases
-__register_frame_table
 __res_close
+__res_disable_mt
 __res_dnok
+__res_enable_mt
 __res_hnok
 __res_hostalias
 __res_isourserver
@@ -134,7 +104,6 @@ __res_send_setrhook
 __sched_cpualloc
 __sched_cpucount
 __sched_cpufree
-__sfp_handle_exceptions
 __snprintf_chk
 __sprintf_chk
 __srefill
@@ -175,6 +144,7 @@ _exit
 _getlong
 _getshort
 _longjmp
+_mktemp
 _resolv_flush_cache_for_net
 _resolv_set_nameservers_for_net
 _setjmp
@@ -194,9 +164,7 @@ android_getaddrinfofornet
 android_gethostbyaddrfornet
 android_gethostbynamefornet
 arc4random
-arc4random_addrandom
 arc4random_buf
-arc4random_stir
 arc4random_uniform
 asctime
 asctime_r
@@ -239,7 +207,6 @@ clone
 close
 closedir
 closelog
-cmsg_nxthdr
 connect
 creat
 creat64
@@ -453,6 +420,8 @@ inet_lnaof
 inet_makeaddr
 inet_netof
 inet_network
+inet_nsap_addr
+inet_nsap_ntoa
 inet_ntoa
 inet_ntop
 inet_pton
@@ -586,6 +555,7 @@ nftw
 nftw64
 nice
 nrand48
+nsdispatch
 ntohl
 ntohs
 open
@@ -829,6 +799,7 @@ sleep
 snprintf
 socket
 socketpair
+splice
 sprintf
 srand
 srand48
@@ -908,6 +879,7 @@ tcsetattr
 tcsetpgrp
 tdelete
 tdestroy
+tee
 tempnam
 tfind
 tgkill
@@ -962,6 +934,7 @@ vfprintf
 vfscanf
 vfwprintf
 vfwscanf
+vmsplice
 vprintf
 vscanf
 vsnprintf

ndk/platforms/android-L/arch-arm64/symbols/libm.so.functions.txt

@@ -1,22 +1,6 @@
-__addtf3
-__divtf3
-__eqtf2
-__extenddftf2
-__extendsftf2
-__fixtfdi
-__fixtfsi
-__floatsitf
-__getf2
-__gttf2
-__letf2
-__lttf2
-__netf2
 __signbit
 __signbitf
 __signbitl
-__subtf3
-__trunctfdf2
-__trunctfsf2
 acos
 acosf
 acosh

ndk/platforms/android-L/arch-mips/include/asm/fcntl.h

@@ -46,19 +46,21 @@
 #define F_SETLKW64 35
 #endif
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#ifdef _ABIO32
 #include <linux/types.h>
 struct flock {
  short l_type;
- short l_whence;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ short l_whence;
  __kernel_off_t l_start;
  __kernel_off_t l_len;
  long l_sysid;
- __kernel_pid_t l_pid;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __kernel_pid_t l_pid;
  long pad[4];
 };
 #define HAVE_ARCH_STRUCT_FLOCK
-#include <asm-generic/fcntl.h>
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #endif
+#include <asm-generic/fcntl.h>
+#endif

ndk/platforms/android-L/arch-mips/include/asm/msgbuf.h

@@ -21,21 +21,29 @@
 struct msqid64_ds {
  struct ipc64_perm msg_perm;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned long __unused1;
  __kernel_time_t msg_stime;
- unsigned long __unused2;
+#ifdef _ABIO32
- __kernel_time_t msg_rtime;
+ unsigned long __unused1;
+#endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __kernel_time_t msg_rtime;
+#ifdef _ABIO32
+ unsigned long __unused2;
+#endif
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned long __unused3;
  __kernel_time_t msg_ctime;
+#ifdef _ABIO32
+ unsigned long __unused3;
+#endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  unsigned long msg_cbytes;
  unsigned long msg_qnum;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  unsigned long msg_qbytes;
  __kernel_pid_t msg_lspid;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  __kernel_pid_t msg_lrpid;
  unsigned long __unused4;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  unsigned long __unused5;
 };
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #endif

ndk/platforms/android-L/arch-mips/include/asm/resource.h

@@ -24,7 +24,10 @@
 #define RLIMIT_RSS 7
 #define RLIMIT_NPROC 8
 #define RLIMIT_MEMLOCK 9
-#define RLIM_INFINITY 0x7fffffffUL
+#ifdef _ABIO32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define RLIM_INFINITY 0x7fffffffUL
+#endif
 #include <asm-generic/resource.h>
 #endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

ndk/platforms/android-L/arch-mips/include/asm/siginfo.h

@@ -24,81 +24,83 @@
 #define HAVE_ARCH_SIGINFO_T
 #define HAVE_ARCH_COPY_SIGINFO
 struct siginfo;
-#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
+#ifdef _ABIO32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
+#endif
 #ifdef __LP64__
 #undef __ARCH_SI_PREAMBLE_SIZE
 #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #endif
 #include <asm-generic/siginfo.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 typedef struct siginfo {
  int si_signo;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int si_code;
  int si_errno;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int __pad0[SI_MAX_SIZE / sizeof(int) - SI_PAD_SIZE - 3];
  union {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int _pad[SI_PAD_SIZE];
  struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  pid_t _pid;
  __ARCH_SI_UID_T _uid;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  } _kill;
  struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  timer_t _tid;
  int _overrun;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
  sigval_t _sigval;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int _sys_private;
  } _timer;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  struct {
  pid_t _pid;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  __ARCH_SI_UID_T _uid;
  sigval_t _sigval;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  } _rt;
  struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  pid_t _pid;
  __ARCH_SI_UID_T _uid;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int _status;
  clock_t _utime;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  clock_t _stime;
  } _sigchld;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  struct {
  pid_t _pid;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  clock_t _utime;
  int _status;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  clock_t _stime;
  } _irix_sigchld;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  struct {
  void __user *_addr;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #ifdef __ARCH_SI_TRAPNO
  int _trapno;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #endif
  short _addr_lsb;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  } _sigfault;
  struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  __ARCH_SI_BAND_T _band;
  int _fd;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  } _sigpoll;
  } _sifields;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 } siginfo_t;
 #undef SI_ASYNCIO
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #undef SI_TIMER
 #undef SI_MESGQ
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define SI_ASYNCIO -2
 #define SI_TIMER __SI_CODE(__SI_TIMER, -3)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define SI_MESGQ __SI_CODE(__SI_MESGQ, -4)
 #endif
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

ndk/platforms/android-L/arch-mips/include/asm/types.h

@@ -18,11 +18,6 @@
  ****************************************************************************/
 #ifndef _UAPI_ASM_TYPES_H
 #define _UAPI_ASM_TYPES_H
-#if _MIPS_SZLONG == 64
-#include <asm-generic/int-l64.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#else
 #include <asm-generic/int-ll64.h>
 #endif
-#endif
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt

@@ -32,6 +32,7 @@ _ZnwjRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
+___mtctxres
 __accept4
 __android_set_abort_message
 __assert
@@ -40,6 +41,7 @@ __b64_ntop
 __b64_pton
 __bionic_name_mem
 __brk
+__cmsg_nxthdr
 __connect
 __cxa_atexit
 __cxa_finalize
@@ -75,6 +77,7 @@ __get_tls
 __getcpu
 __getcwd
 __getdents64
+__getpid
 __getpriority
 __hostalias
 __ioctl
@@ -135,7 +138,9 @@ __register_frame_info_table
 __register_frame_info_table_bases
 __register_frame_table
 __res_close
+__res_disable_mt
 __res_dnok
+__res_enable_mt
 __res_hnok
 __res_hostalias
 __res_isourserver
@@ -225,6 +230,7 @@ _getshort
 _longjmp
 _memset16
 _memset32
+_mktemp
 _resolv_flush_cache_for_net
 _resolv_set_nameservers_for_net
 _setjmp
@@ -244,9 +250,7 @@ android_getaddrinfofornet
 android_gethostbyaddrfornet
 android_gethostbynamefornet
 arc4random
-arc4random_addrandom
 arc4random_buf
-arc4random_stir
 arc4random_uniform
 asctime
 asctime64
@@ -519,6 +523,8 @@ inet_lnaof
 inet_makeaddr
 inet_netof
 inet_network
+inet_nsap_addr
+inet_nsap_ntoa
 inet_ntoa
 inet_ntop
 inet_pton
@@ -657,6 +663,7 @@ nftw
 nftw64
 nice
 nrand48
+nsdispatch
 ntohl
 ntohs
 open
@@ -910,6 +917,7 @@ sleep
 snprintf
 socket
 socketpair
+splice
 sprintf
 srand
 srand48
@@ -994,6 +1002,7 @@ tcsetattr
 tcsetpgrp
 tdelete
 tdestroy
+tee
 tempnam
 tfind
 tgkill
@@ -1053,6 +1062,7 @@ vfprintf
 vfscanf
 vfwprintf
 vfwscanf
+vmsplice
 vprintf
 vscanf
 vsnprintf

ndk/platforms/android-L/arch-mips64/include/asm/fcntl.h

@@ -46,19 +46,21 @@
 #define F_SETLKW64 35
 #endif
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#ifdef _ABIO32
 #include <linux/types.h>
 struct flock {
  short l_type;
- short l_whence;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ short l_whence;
  __kernel_off_t l_start;
  __kernel_off_t l_len;
  long l_sysid;
- __kernel_pid_t l_pid;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __kernel_pid_t l_pid;
  long pad[4];
 };
 #define HAVE_ARCH_STRUCT_FLOCK
-#include <asm-generic/fcntl.h>
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #endif
+#include <asm-generic/fcntl.h>
+#endif

ndk/platforms/android-L/arch-mips64/include/asm/msgbuf.h

@@ -21,21 +21,29 @@
 struct msqid64_ds {
  struct ipc64_perm msg_perm;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned long __unused1;
  __kernel_time_t msg_stime;
- unsigned long __unused2;
+#ifdef _ABIO32
- __kernel_time_t msg_rtime;
+ unsigned long __unused1;
+#endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __kernel_time_t msg_rtime;
+#ifdef _ABIO32
+ unsigned long __unused2;
+#endif
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned long __unused3;
  __kernel_time_t msg_ctime;
+#ifdef _ABIO32
+ unsigned long __unused3;
+#endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  unsigned long msg_cbytes;
  unsigned long msg_qnum;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  unsigned long msg_qbytes;
  __kernel_pid_t msg_lspid;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  __kernel_pid_t msg_lrpid;
  unsigned long __unused4;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  unsigned long __unused5;
 };
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #endif

ndk/platforms/android-L/arch-mips64/include/asm/resource.h

@@ -24,7 +24,10 @@
 #define RLIMIT_RSS 7
 #define RLIMIT_NPROC 8
 #define RLIMIT_MEMLOCK 9
-#define RLIM_INFINITY 0x7fffffffUL
+#ifdef _ABIO32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define RLIM_INFINITY 0x7fffffffUL
+#endif
 #include <asm-generic/resource.h>
 #endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

ndk/platforms/android-L/arch-mips64/include/asm/siginfo.h

@@ -24,81 +24,83 @@
 #define HAVE_ARCH_SIGINFO_T
 #define HAVE_ARCH_COPY_SIGINFO
 struct siginfo;
-#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
+#ifdef _ABIO32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
+#endif
 #ifdef __LP64__
 #undef __ARCH_SI_PREAMBLE_SIZE
 #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #endif
 #include <asm-generic/siginfo.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 typedef struct siginfo {
  int si_signo;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int si_code;
  int si_errno;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int __pad0[SI_MAX_SIZE / sizeof(int) - SI_PAD_SIZE - 3];
  union {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int _pad[SI_PAD_SIZE];
  struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  pid_t _pid;
  __ARCH_SI_UID_T _uid;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  } _kill;
  struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  timer_t _tid;
  int _overrun;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
  sigval_t _sigval;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int _sys_private;
  } _timer;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  struct {
  pid_t _pid;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  __ARCH_SI_UID_T _uid;
  sigval_t _sigval;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  } _rt;
  struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  pid_t _pid;
  __ARCH_SI_UID_T _uid;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  int _status;
  clock_t _utime;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  clock_t _stime;
  } _sigchld;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  struct {
  pid_t _pid;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  clock_t _utime;
  int _status;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  clock_t _stime;
  } _irix_sigchld;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  struct {
  void __user *_addr;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #ifdef __ARCH_SI_TRAPNO
  int _trapno;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #endif
  short _addr_lsb;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  } _sigfault;
  struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  __ARCH_SI_BAND_T _band;
  int _fd;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  } _sigpoll;
  } _sifields;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 } siginfo_t;
 #undef SI_ASYNCIO
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #undef SI_TIMER
 #undef SI_MESGQ
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define SI_ASYNCIO -2
 #define SI_TIMER __SI_CODE(__SI_TIMER, -3)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define SI_MESGQ __SI_CODE(__SI_MESGQ, -4)
 #endif
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

ndk/platforms/android-L/arch-mips64/include/asm/types.h

@@ -18,11 +18,6 @@
  ****************************************************************************/
 #ifndef _UAPI_ASM_TYPES_H
 #define _UAPI_ASM_TYPES_H
-#if _MIPS_SZLONG == 64
-#include <asm-generic/int-l64.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#else
 #include <asm-generic/int-ll64.h>
 #endif
-#endif
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt

@@ -1,26 +1,4 @@
-SHA1Final
-SHA1Init
-SHA1Transform
-SHA1Update
 _Exit
-_Unwind_Backtrace
-_Unwind_DeleteException
-_Unwind_FindEnclosingFunction
-_Unwind_Find_FDE
-_Unwind_ForcedUnwind
-_Unwind_GetCFA
-_Unwind_GetDataRelBase
-_Unwind_GetGR
-_Unwind_GetIP
-_Unwind_GetIPInfo
-_Unwind_GetLanguageSpecificData
-_Unwind_GetRegionStart
-_Unwind_GetTextRelBase
-_Unwind_RaiseException
-_Unwind_Resume
-_Unwind_Resume_or_Rethrow
-_Unwind_SetGR
-_Unwind_SetIP
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -32,21 +10,20 @@ _ZnwmRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
+___mtctxres
 __android_set_abort_message
 __assert
 __assert2
 __b64_ntop
 __b64_pton
 __bionic_name_mem
+__cmsg_nxthdr
 __cxa_atexit
 __cxa_finalize
 __cxa_guard_abort
 __cxa_guard_acquire
 __cxa_guard_release
 __cxa_pure_virtual
-__deregister_frame
-__deregister_frame_info
-__deregister_frame_info_bases
 __dn_comp
 __dn_count_labels
 __dn_skipname
@@ -59,7 +36,6 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__frame_state_for
 __get_h_errno
 __hostalias
 __isfinite
@@ -82,7 +58,6 @@ __loc_ntoa
 __memcpy_chk
 __memmove_chk
 __memset_chk
-__multf3
 __open_2
 __openat_2
 __p_cdname
@@ -96,7 +71,6 @@ __p_rcode
 __p_secstodate
 __p_time
 __p_type
-__popcountdi2
 __pthread_cleanup_pop
 __pthread_cleanup_push
 __pthread_gettid
@@ -104,14 +78,10 @@ __putlong
 __putshort
 __read_chk
 __recvfrom_chk
-__register_frame
-__register_frame_info
-__register_frame_info_bases
-__register_frame_info_table
-__register_frame_info_table_bases
-__register_frame_table
 __res_close
+__res_disable_mt
 __res_dnok
+__res_enable_mt
 __res_hnok
 __res_hostalias
 __res_isourserver
@@ -175,6 +145,7 @@ _flush_cache
 _getlong
 _getshort
 _longjmp
+_mktemp
 _resolv_flush_cache_for_net
 _resolv_set_nameservers_for_net
 _setjmp
@@ -194,9 +165,7 @@ android_getaddrinfofornet
 android_gethostbyaddrfornet
 android_gethostbynamefornet
 arc4random
-arc4random_addrandom
 arc4random_buf
-arc4random_stir
 arc4random_uniform
 asctime
 asctime_r
@@ -239,7 +208,6 @@ clone
 close
 closedir
 closelog
-cmsg_nxthdr
 connect
 creat
 creat64
@@ -453,6 +421,8 @@ inet_lnaof
 inet_makeaddr
 inet_netof
 inet_network
+inet_nsap_addr
+inet_nsap_ntoa
 inet_ntoa
 inet_ntop
 inet_pton
@@ -586,6 +556,7 @@ nftw
 nftw64
 nice
 nrand48
+nsdispatch
 ntohl
 ntohs
 open
@@ -829,6 +800,7 @@ sleep
 snprintf
 socket
 socketpair
+splice
 sprintf
 srand
 srand48
@@ -908,6 +880,7 @@ tcsetattr
 tcsetpgrp
 tdelete
 tdestroy
+tee
 tempnam
 tfind
 tgkill
@@ -962,6 +935,7 @@ vfprintf
 vfscanf
 vfwprintf
 vfwscanf
+vmsplice
 vprintf
 vscanf
 vsnprintf

ndk/platforms/android-L/arch-mips64/symbols/libm.so.functions.txt

@@ -1,22 +1,6 @@
-__addtf3
-__divtf3
-__eqtf2
-__extenddftf2
-__extendsftf2
-__fixtfdi
-__fixtfsi
-__floatsitf
-__getf2
-__gttf2
-__letf2
-__lttf2
-__netf2
 __signbit
 __signbitf
 __signbitl
-__subtf3
-__trunctfdf2
-__trunctfsf2
 acos
 acosf
 acosh

ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt

@@ -32,6 +32,7 @@ _ZnwjRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
+___mtctxres
 __accept4
 __android_set_abort_message
 __assert
@@ -40,6 +41,7 @@ __b64_ntop
 __b64_pton
 __bionic_name_mem
 __brk
+__cmsg_nxthdr
 __connect
 __cxa_atexit
 __cxa_finalize
@@ -75,6 +77,7 @@ __get_tls
 __getcpu
 __getcwd
 __getdents64
+__getpid
 __getpriority
 __hostalias
 __ioctl
@@ -135,7 +138,9 @@ __register_frame_info_table
 __register_frame_info_table_bases
 __register_frame_table
 __res_close
+__res_disable_mt
 __res_dnok
+__res_enable_mt
 __res_hnok
 __res_hostalias
 __res_isourserver
@@ -222,6 +227,7 @@ _exit
 _getlong
 _getshort
 _longjmp
+_mktemp
 _resolv_flush_cache_for_net
 _resolv_set_nameservers_for_net
 _setjmp
@@ -241,9 +247,7 @@ android_getaddrinfofornet
 android_gethostbyaddrfornet
 android_gethostbynamefornet
 arc4random
-arc4random_addrandom
 arc4random_buf
-arc4random_stir
 arc4random_uniform
 asctime
 asctime64
@@ -515,6 +519,8 @@ inet_lnaof
 inet_makeaddr
 inet_netof
 inet_network
+inet_nsap_addr
+inet_nsap_ntoa
 inet_ntoa
 inet_ntop
 inet_pton
@@ -653,6 +659,7 @@ nftw
 nftw64
 nice
 nrand48
+nsdispatch
 ntohl
 ntohs
 open
@@ -906,6 +913,7 @@ sleep
 snprintf
 socket
 socketpair
+splice
 sprintf
 srand
 srand48
@@ -990,6 +998,7 @@ tcsetattr
 tcsetpgrp
 tdelete
 tdestroy
+tee
 tempnam
 tfind
 tgkill
@@ -1049,6 +1058,7 @@ vfprintf
 vfscanf
 vfwprintf
 vfwscanf
+vmsplice
 vprintf
 vscanf
 vsnprintf

ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt

@@ -1,26 +1,4 @@
-SHA1Final
-SHA1Init
-SHA1Transform
-SHA1Update
 _Exit
-_Unwind_Backtrace
-_Unwind_DeleteException
-_Unwind_FindEnclosingFunction
-_Unwind_Find_FDE
-_Unwind_ForcedUnwind
-_Unwind_GetCFA
-_Unwind_GetDataRelBase
-_Unwind_GetGR
-_Unwind_GetIP
-_Unwind_GetIPInfo
-_Unwind_GetLanguageSpecificData
-_Unwind_GetRegionStart
-_Unwind_GetTextRelBase
-_Unwind_RaiseException
-_Unwind_Resume
-_Unwind_Resume_or_Rethrow
-_Unwind_SetGR
-_Unwind_SetIP
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -32,21 +10,20 @@ _ZnwmRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
+___mtctxres
 __android_set_abort_message
 __assert
 __assert2
 __b64_ntop
 __b64_pton
 __bionic_name_mem
+__cmsg_nxthdr
 __cxa_atexit
 __cxa_finalize
 __cxa_guard_abort
 __cxa_guard_acquire
 __cxa_guard_release
 __cxa_pure_virtual
-__deregister_frame
-__deregister_frame_info
-__deregister_frame_info_bases
 __dn_comp
 __dn_count_labels
 __dn_skipname
@@ -59,7 +36,6 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__frame_state_for
 __get_h_errno
 __hostalias
 __isfinite
@@ -82,7 +58,6 @@ __loc_ntoa
 __memcpy_chk
 __memmove_chk
 __memset_chk
-__multf3
 __open_2
 __openat_2
 __p_cdname
@@ -96,7 +71,6 @@ __p_rcode
 __p_secstodate
 __p_time
 __p_type
-__popcountdi2
 __pthread_cleanup_pop
 __pthread_cleanup_push
 __pthread_gettid
@@ -104,14 +78,10 @@ __putlong
 __putshort
 __read_chk
 __recvfrom_chk
-__register_frame
-__register_frame_info
-__register_frame_info_bases
-__register_frame_info_table
-__register_frame_info_table_bases
-__register_frame_table
 __res_close
+__res_disable_mt
 __res_dnok
+__res_enable_mt
 __res_hnok
 __res_hostalias
 __res_isourserver
@@ -134,7 +104,6 @@ __res_send_setrhook
 __sched_cpualloc
 __sched_cpucount
 __sched_cpufree
-__sfp_handle_exceptions
 __snprintf_chk
 __sprintf_chk
 __srefill
@@ -175,6 +144,7 @@ _exit
 _getlong
 _getshort
 _longjmp
+_mktemp
 _resolv_flush_cache_for_net
 _resolv_set_nameservers_for_net
 _setjmp
@@ -194,9 +164,7 @@ android_getaddrinfofornet
 android_gethostbyaddrfornet
 android_gethostbynamefornet
 arc4random
-arc4random_addrandom
 arc4random_buf
-arc4random_stir
 arc4random_uniform
 asctime
 asctime_r
@@ -239,7 +207,6 @@ clone
 close
 closedir
 closelog
-cmsg_nxthdr
 connect
 creat
 creat64
@@ -453,6 +420,8 @@ inet_lnaof
 inet_makeaddr
 inet_netof
 inet_network
+inet_nsap_addr
+inet_nsap_ntoa
 inet_ntoa
 inet_ntop
 inet_pton
@@ -586,6 +555,7 @@ nftw
 nftw64
 nice
 nrand48
+nsdispatch
 ntohl
 ntohs
 open
@@ -829,6 +799,7 @@ sleep
 snprintf
 socket
 socketpair
+splice
 sprintf
 srand
 srand48
@@ -908,6 +879,7 @@ tcsetattr
 tcsetpgrp
 tdelete
 tdestroy
+tee
 tempnam
 tfind
 tgkill
@@ -962,6 +934,7 @@ vfprintf
 vfscanf
 vfwprintf
 vfwscanf
+vmsplice
 vprintf
 vscanf
 vsnprintf

ndk/platforms/android-L/arch-x86_64/symbols/libc.so.variables.txt

@@ -6,7 +6,6 @@ __isthreaded
 __libc_malloc_dispatch
 __p_class_syms
 __p_type_syms
-__popcount_tab
 __progname
 __sF
 __stack_chk_guard

ndk/platforms/android-L/arch-x86_64/symbols/libm.so.functions.txt

@@ -1,22 +1,6 @@
-__addtf3
-__divtf3
-__eqtf2
-__extenddftf2
-__extendsftf2
-__fixtfdi
-__fixtfsi
-__floatsitf
-__getf2
-__gttf2
-__letf2
-__lttf2
-__netf2
 __signbit
 __signbitf
 __signbitl
-__subtf3
-__trunctfdf2
-__trunctfsf2
 acos
 acosf
 acosh

ndk/platforms/android-L/include/fcntl.h

@@ -33,6 +33,7 @@
 #include <sys/types.h>
 #include <linux/fadvise.h>
 #include <linux/fcntl.h>
+#include <linux/uio.h>
 #include <unistd.h>  /* this is not required, but makes client code much happier */
 
 __BEGIN_DECLS
@@ -51,9 +52,12 @@ struct flock64 {
 #define F_SETLKW64 F_SETLKW
 #endif
 
-#ifndef O_ASYNC
+#define O_ASYNC FASYNC
-#define O_ASYNC  FASYNC
+
-#endif
+#define SPLICE_F_MOVE 1
+#define SPLICE_F_NONBLOCK 2
+#define SPLICE_F_MORE 4
+#define SPLICE_F_GIFT 8
 
 #define SYNC_FILE_RANGE_WAIT_BEFORE 1
 #define SYNC_FILE_RANGE_WRITE 2
@@ -70,7 +74,10 @@ extern int open(const char*, int, ...);
 extern int open64(const char*, int, ...);
 extern int posix_fallocate64(int, off64_t, off64_t);
 extern int posix_fallocate(int, off_t, off_t);
+extern ssize_t splice(int, off64_t*, int, off64_t*, size_t, unsigned int);
+extern ssize_t tee(int, int, size_t, unsigned int);
 extern int unlinkat(int, const char*, int);
+extern ssize_t vmsplice(int, const struct iovec*, size_t, unsigned int);
 
 #if defined(__BIONIC_FORTIFY)
 

ndk/platforms/android-L/include/nsswitch.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: nsswitch.h,v 1.18 2005/11/29 03:12:58 christos Exp $	*/
+/*	$NetBSD: nsswitch.h,v 1.21 2011/07/17 20:54:34 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -137,6 +130,7 @@ typedef struct {
 #else
 #   define NS_NIS_CB(F,C)
 #endif
+#define	NS_NULL_CB		{ .src = NULL },
 
 /*
  * ns_src - `nsswitch source'
@@ -149,7 +143,6 @@ typedef struct {
 } ns_src;
 
 
-#if 0
 /*
  * Default sourcelists (if nsswitch.conf is missing, corrupt,
  * or the requested database doesn't have an entry)
@@ -161,7 +154,7 @@ extern const ns_src __nsdefaultfiles[];
 extern const ns_src __nsdefaultfiles_forceall[];
 extern const ns_src __nsdefaultnis[];
 extern const ns_src __nsdefaultnis_forceall[];
-#endif
+
 
 /*
  * ns_mtab - `nsswitch method table'
@@ -222,7 +215,7 @@ typedef struct {
 
 __BEGIN_DECLS
 int	nsdispatch(void *, const ns_dtab [], const char *,
-			const char *, const ns_src [], ...);
+			const char *, const ns_src [], ...) __LIBC_ABI_PUBLIC__;
 
 #ifdef _NS_PRIVATE
 int		 _nsdbtaddsrc(ns_dbt *, const ns_src *);

ndk/platforms/android-L/include/signal.h

@@ -34,6 +34,7 @@
 #include <limits.h>		/* For LONG_BIT */
 #include <string.h>		/* For memset() */
 #include <sys/types.h>
+#include <asm/sigcontext.h>
 
 #if defined(__LP64__) || defined(__mips__)
 /* For 64-bit (and mips), the kernel's struct sigaction doesn't match the POSIX one,

ndk/platforms/android-L/include/stdlib.h

@@ -100,9 +100,10 @@ extern unsigned short *seed48(unsigned short*);
 extern double erand48(unsigned short xsubi[3]);
 extern double drand48(void);
 extern void srand48(long);
-extern unsigned int arc4random(void);
+
-extern void arc4random_stir(void);
+unsigned int arc4random(void);
-extern void arc4random_addrandom(unsigned char *, int);
+unsigned int arc4random_uniform(unsigned int);
+void arc4random_buf(void*, size_t);
 
 #define RAND_MAX 0x7fffffff
 

ndk/platforms/android-L/include/strings.h

@@ -43,8 +43,16 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-#define bcopy(b1, b2, len) (void)(memmove((b2), (b1), (len)))
+#if defined(__BIONIC_FORTIFY)
-#define bzero(b, len) (void)(memset((b), '\0', (len)))
+#define bcopy(b1, b2, len) \
+  (void)(__builtin___memmove_chk((b2), (b1), (len), __bos0(b2)))
+#define bzero(b, len) \
+  (void)(__builtin___memset_chk((b), '\0', (len), __bos0(b)))
+#else
+#define bcopy(b1, b2, len) (void)(__builtin_memmove((b2), (b1), (len)))
+#define bzero(b, len) (void)(__builtin_memset((b), '\0', (len)))
+#endif
+
 
 int	 ffs(int);
 int	 strcasecmp(const char *, const char *);

ndk/platforms/android-L/include/sys/sha1.h

@@ -1,31 +0,0 @@
-/*	$NetBSD: sha1.h,v 1.13 2005/12/26 18:41:36 perry Exp $	*/
-
-/*
- * SHA-1 in C
- * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
- */
-
-#ifndef _SYS_SHA1_H_
-#define	_SYS_SHA1_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#define SHA1_DIGEST_LENGTH		20
-#define SHA1_DIGEST_STRING_LENGTH	41
-
-typedef struct {
-	uint32_t state[5];
-	uint32_t count[2];
-	u_char buffer[64];
-} SHA1_CTX;
-
-__BEGIN_DECLS
-void	SHA1Transform(uint32_t[5], const u_char[64]);
-void	SHA1Init(SHA1_CTX *);
-void	SHA1Update(SHA1_CTX *, const u_char *, u_int);
-void	SHA1Final(u_char[SHA1_DIGEST_LENGTH], SHA1_CTX *);
-__END_DECLS
-
-#endif /* _SYS_SHA1_H_ */

ndk/platforms/android-L/include/sys/socket.h

@@ -107,7 +107,7 @@ struct cmsghdr {
   int cmsg_type;
 };
 
-#define CMSG_NXTHDR(mhdr, cmsg) cmsg_nxthdr((mhdr), (cmsg))
+#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr((mhdr), (cmsg))
 #define CMSG_ALIGN(len) ( ((len)+sizeof(long)-1) & ~(sizeof(long)-1) )
 #define CMSG_DATA(cmsg) ((void*)((char*)(cmsg) + CMSG_ALIGN(sizeof(struct cmsghdr))))
 #define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(len))
@@ -117,7 +117,7 @@ struct cmsghdr {
    ? (struct cmsghdr*) (msg)->msg_control : (struct cmsghdr*) NULL)
 #define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) &&   (cmsg)->cmsg_len <= (unsigned long)   ((mhdr)->msg_controllen -   ((char*)(cmsg) - (char*)(mhdr)->msg_control)))
 
-struct cmsghdr* cmsg_nxthdr(struct msghdr*, struct cmsghdr*);
+struct cmsghdr* __cmsg_nxthdr(struct msghdr*, struct cmsghdr*);
 
 #define SCM_RIGHTS 0x01
 #define SCM_CREDENTIALS 0x02

ndk/platforms/android-L/include/sys/types.h

@@ -91,12 +91,17 @@ typedef __kernel_time_t __time_t;
 typedef __time_t time_t;
 
 /* This historical accident means that we had a 32-bit off_t on 32-bit architectures. */
-#ifndef _OFF_T_DEFINED_
+#if !defined(__LP64__)
-#define _OFF_T_DEFINED_
 typedef __kernel_off_t off_t;
-#endif
 typedef __kernel_loff_t loff_t;
 typedef loff_t off64_t;
+#else
+/* We could re-use the LP32 definitions, but that would mean that although off_t and loff_t/off64_t
+ * would be the same size, they wouldn't actually be the same type, which can lead to warnings. */
+typedef __kernel_off_t off_t;
+typedef off_t loff_t;
+typedef loff_t off64_t;
+#endif
 
 /* while POSIX wants these in <sys/types.h>, we
  * declare then in <pthread.h> instead */