Add missing symbols to android-18 libc

This affects libc.so for android-18 and 19

Symbols missing from NDK libc but present in the
platform version of libc:

__strchr_chk
__strrchr_chk
__umask_chk
ffs # x86 only
getauxval
getdelim
getline
signalfd
wait4 # already present in android-19

Bug: http://b/28864994
Change-Id: Ib8ccc3706516be9590f2646edefac389d8538319

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

@@ -134,12 +134,14 @@ __sprintf_chk
 __stack_chk_fail
 __statfs64
 __strcat_chk
+__strchr_chk
 __strcpy_chk
 __strlcat_chk
 __strlcpy_chk
 __strlen_chk
 __strncat_chk
 __strncpy_chk
+__strrchr_chk
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -154,6 +156,7 @@ __timer_delete
 __timer_getoverrun
 __timer_gettime
 __timer_settime
+__umask_chk
 __vsnprintf_chk
 __vsprintf_chk
 __waitid
@@ -315,11 +318,13 @@ fwrite
 fwscanf
 gai_strerror
 getaddrinfo
+getauxval
 getc
 getc_unlocked
 getchar
 getchar_unlocked
 getcwd
+getdelim
 getegid
 getenv
 geteuid
@@ -335,6 +340,7 @@ gethostbyname_r
 gethostent
 gethostname
 getitimer
+getline
 getlogin
 getmntent
 getnameinfo
@@ -695,6 +701,7 @@ sigaltstack
 sigblock
 siginterrupt
 siglongjmp
+signalfd
 sigpending
 sigprocmask
 sigsetjmp
@@ -822,6 +829,7 @@ vwarn
 vwarnx
 vwprintf
 wait
+wait4
 waitid
 waitpid
 warn

ndk/platforms/android-18/arch-arm/symbols/libc.so.versions.txt

@@ -129,12 +129,14 @@ LIBC {
     __stack_chk_guard;
     __statfs64; # arm x86 mips
     __strcat_chk;
+    __strchr_chk;
     __strcpy_chk;
     __strlcat_chk;
     __strlcpy_chk;
     __strlen_chk;
     __strncat_chk;
     __strncpy_chk;
+    __strrchr_chk;
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
@@ -150,6 +152,7 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
     __waitid; # arm x86 mips
@@ -315,11 +318,13 @@ LIBC {
     fwscanf;
     gai_strerror;
     getaddrinfo;
+    getauxval;
     getc;
     getc_unlocked;
     getchar;
     getchar_unlocked;
     getcwd;
+    getdelim;
     getegid;
     getenv;
     geteuid;
@@ -335,6 +340,7 @@ LIBC {
     gethostent;
     gethostname;
     getitimer;
+    getline;
     getlogin;
     getmntent;
     getnameinfo;
@@ -700,6 +706,7 @@ LIBC {
     sigblock;
     siginterrupt;
     siglongjmp;
+    signalfd;
     sigpending;
     sigprocmask;
     sigsetjmp;
@@ -831,6 +838,7 @@ LIBC {
     vwarnx;
     vwprintf;
     wait;
+    wait4;
     waitid;
     waitpid;
     warn;

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

@@ -116,12 +116,14 @@ __sprintf_chk
 __stack_chk_fail
 __statfs64
 __strcat_chk
+__strchr_chk
 __strcpy_chk
 __strlcat_chk
 __strlcpy_chk
 __strlen_chk
 __strncat_chk
 __strncpy_chk
+__strrchr_chk
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -136,6 +138,7 @@ __timer_delete
 __timer_getoverrun
 __timer_gettime
 __timer_settime
+__umask_chk
 __vsnprintf_chk
 __vsprintf_chk
 __waitid
@@ -298,11 +301,13 @@ fwrite
 fwscanf
 gai_strerror
 getaddrinfo
+getauxval
 getc
 getc_unlocked
 getchar
 getchar_unlocked
 getcwd
+getdelim
 getegid
 getenv
 geteuid
@@ -318,6 +323,7 @@ gethostbyname_r
 gethostent
 gethostname
 getitimer
+getline
 getlogin
 getmntent
 getnameinfo
@@ -678,6 +684,7 @@ sigaltstack
 sigblock
 siginterrupt
 siglongjmp
+signalfd
 sigpending
 sigprocmask
 sigsetjmp
@@ -805,6 +812,7 @@ vwarn
 vwarnx
 vwprintf
 wait
+wait4
 waitid
 waitpid
 warn

ndk/platforms/android-18/arch-mips/symbols/libc.so.versions.txt

@@ -125,12 +125,14 @@ LIBC {
     __stack_chk_guard;
     __statfs64; # arm x86 mips
     __strcat_chk;
+    __strchr_chk;
     __strcpy_chk;
     __strlcat_chk;
     __strlcpy_chk;
     __strlen_chk;
     __strncat_chk;
     __strncpy_chk;
+    __strrchr_chk;
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
@@ -146,6 +148,7 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
     __waitid; # arm x86 mips
@@ -312,11 +315,13 @@ LIBC {
     fwscanf;
     gai_strerror;
     getaddrinfo;
+    getauxval;
     getc;
     getc_unlocked;
     getchar;
     getchar_unlocked;
     getcwd;
+    getdelim;
     getegid;
     getenv;
     geteuid;
@@ -332,6 +337,7 @@ LIBC {
     gethostent;
     gethostname;
     getitimer;
+    getline;
     getlogin;
     getmntent;
     getnameinfo;
@@ -697,6 +703,7 @@ LIBC {
     sigblock;
     siginterrupt;
     siglongjmp;
+    signalfd;
     sigpending;
     sigprocmask;
     sigsetjmp;
@@ -828,6 +835,7 @@ LIBC {
     vwarnx;
     vwprintf;
     wait;
+    wait4;
     waitid;
     waitpid;
     warn;

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

@@ -116,12 +116,14 @@ __sprintf_chk
 __stack_chk_fail
 __statfs64
 __strcat_chk
+__strchr_chk
 __strcpy_chk
 __strlcat_chk
 __strlcpy_chk
 __strlen_chk
 __strncat_chk
 __strncpy_chk
+__strrchr_chk
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -136,6 +138,7 @@ __timer_delete
 __timer_getoverrun
 __timer_gettime
 __timer_settime
+__umask_chk
 __vsnprintf_chk
 __vsprintf_chk
 __waitid
@@ -240,6 +243,7 @@ fdopendir
 feof
 ferror
 fflush
+ffs
 fgetc
 fgetln
 fgetpos
@@ -295,11 +299,13 @@ fwrite
 fwscanf
 gai_strerror
 getaddrinfo
+getauxval
 getc
 getc_unlocked
 getchar
 getchar_unlocked
 getcwd
+getdelim
 getegid
 getenv
 geteuid
@@ -315,6 +321,7 @@ gethostbyname_r
 gethostent
 gethostname
 getitimer
+getline
 getlogin
 getmntent
 getnameinfo
@@ -675,6 +682,7 @@ sigaltstack
 sigblock
 siginterrupt
 siglongjmp
+signalfd
 sigpending
 sigprocmask
 sigsetjmp
@@ -802,6 +810,7 @@ vwarn
 vwarnx
 vwprintf
 wait
+wait4
 waitid
 waitpid
 warn

ndk/platforms/android-18/arch-x86/symbols/libc.so.versions.txt

@@ -125,12 +125,14 @@ LIBC {
     __stack_chk_guard;
     __statfs64; # arm x86 mips
     __strcat_chk;
+    __strchr_chk;
     __strcpy_chk;
     __strlcat_chk;
     __strlcpy_chk;
     __strlen_chk;
     __strncat_chk;
     __strncpy_chk;
+    __strrchr_chk;
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
@@ -146,6 +148,7 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
     __waitid; # arm x86 mips
@@ -254,6 +257,7 @@ LIBC {
     feof;
     ferror;
     fflush;
+    ffs;
     fgetc;
     fgetln;
     fgetpos;
@@ -309,11 +313,13 @@ LIBC {
     fwscanf;
     gai_strerror;
     getaddrinfo;
+    getauxval;
     getc;
     getc_unlocked;
     getchar;
     getchar_unlocked;
     getcwd;
+    getdelim;
     getegid;
     getenv;
     geteuid;
@@ -329,6 +335,7 @@ LIBC {
     gethostent;
     gethostname;
     getitimer;
+    getline;
     getlogin;
     getmntent;
     getnameinfo;
@@ -694,6 +701,7 @@ LIBC {
     sigblock;
     siginterrupt;
     siglongjmp;
+    signalfd;
     sigpending;
     sigprocmask;
     sigsetjmp;
@@ -825,6 +833,7 @@ LIBC {
     vwarnx;
     vwprintf;
     wait;
+    wait4;
     waitid;
     waitpid;
     warn;

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

@@ -134,12 +134,14 @@ __sprintf_chk
 __stack_chk_fail
 __statfs64
 __strcat_chk
+__strchr_chk
 __strcpy_chk
 __strlcat_chk
 __strlcpy_chk
 __strlen_chk
 __strncat_chk
 __strncpy_chk
+__strrchr_chk
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -154,6 +156,7 @@ __timer_delete
 __timer_getoverrun
 __timer_gettime
 __timer_settime
+__umask_chk
 __vsnprintf_chk
 __vsprintf_chk
 __waitid
@@ -316,11 +319,13 @@ fwrite
 fwscanf
 gai_strerror
 getaddrinfo
+getauxval
 getc
 getc_unlocked
 getchar
 getchar_unlocked
 getcwd
+getdelim
 getegid
 getenv
 geteuid
@@ -336,6 +341,7 @@ gethostbyname_r
 gethostent
 gethostname
 getitimer
+getline
 getlogin
 getmntent
 getnameinfo
@@ -696,6 +702,7 @@ sigaltstack
 sigblock
 siginterrupt
 siglongjmp
+signalfd
 sigpending
 sigprocmask
 sigsetjmp

ndk/platforms/android-19/arch-arm/symbols/libc.so.versions.txt

@@ -129,12 +129,14 @@ LIBC {
     __stack_chk_guard;
     __statfs64; # arm x86 mips
     __strcat_chk;
+    __strchr_chk;
     __strcpy_chk;
     __strlcat_chk;
     __strlcpy_chk;
     __strlen_chk;
     __strncat_chk;
     __strncpy_chk;
+    __strrchr_chk;
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
@@ -150,6 +152,7 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
     __waitid; # arm x86 mips
@@ -316,11 +319,13 @@ LIBC {
     fwscanf;
     gai_strerror;
     getaddrinfo;
+    getauxval;
     getc;
     getc_unlocked;
     getchar;
     getchar_unlocked;
     getcwd;
+    getdelim;
     getegid;
     getenv;
     geteuid;
@@ -336,6 +341,7 @@ LIBC {
     gethostent;
     gethostname;
     getitimer;
+    getline;
     getlogin;
     getmntent;
     getnameinfo;
@@ -701,6 +707,7 @@ LIBC {
     sigblock;
     siginterrupt;
     siglongjmp;
+    signalfd;
     sigpending;
     sigprocmask;
     sigsetjmp;

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

@@ -116,12 +116,14 @@ __sprintf_chk
 __stack_chk_fail
 __statfs64
 __strcat_chk
+__strchr_chk
 __strcpy_chk
 __strlcat_chk
 __strlcpy_chk
 __strlen_chk
 __strncat_chk
 __strncpy_chk
+__strrchr_chk
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -136,6 +138,7 @@ __timer_delete
 __timer_getoverrun
 __timer_gettime
 __timer_settime
+__umask_chk
 __vsnprintf_chk
 __vsprintf_chk
 __waitid
@@ -299,11 +302,13 @@ fwrite
 fwscanf
 gai_strerror
 getaddrinfo
+getauxval
 getc
 getc_unlocked
 getchar
 getchar_unlocked
 getcwd
+getdelim
 getegid
 getenv
 geteuid
@@ -319,6 +324,7 @@ gethostbyname_r
 gethostent
 gethostname
 getitimer
+getline
 getlogin
 getmntent
 getnameinfo
@@ -679,6 +685,7 @@ sigaltstack
 sigblock
 siginterrupt
 siglongjmp
+signalfd
 sigpending
 sigprocmask
 sigsetjmp

ndk/platforms/android-19/arch-mips/symbols/libc.so.versions.txt

@@ -125,12 +125,14 @@ LIBC {
     __stack_chk_guard;
     __statfs64; # arm x86 mips
     __strcat_chk;
+    __strchr_chk;
     __strcpy_chk;
     __strlcat_chk;
     __strlcpy_chk;
     __strlen_chk;
     __strncat_chk;
     __strncpy_chk;
+    __strrchr_chk;
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
@@ -146,6 +148,7 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
     __waitid; # arm x86 mips
@@ -313,11 +316,13 @@ LIBC {
     fwscanf;
     gai_strerror;
     getaddrinfo;
+    getauxval;
     getc;
     getc_unlocked;
     getchar;
     getchar_unlocked;
     getcwd;
+    getdelim;
     getegid;
     getenv;
     geteuid;
@@ -333,6 +338,7 @@ LIBC {
     gethostent;
     gethostname;
     getitimer;
+    getline;
     getlogin;
     getmntent;
     getnameinfo;
@@ -698,6 +704,7 @@ LIBC {
     sigblock;
     siginterrupt;
     siglongjmp;
+    signalfd;
     sigpending;
     sigprocmask;
     sigsetjmp;

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

@@ -116,12 +116,14 @@ __sprintf_chk
 __stack_chk_fail
 __statfs64
 __strcat_chk
+__strchr_chk
 __strcpy_chk
 __strlcat_chk
 __strlcpy_chk
 __strlen_chk
 __strncat_chk
 __strncpy_chk
+__strrchr_chk
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -136,6 +138,7 @@ __timer_delete
 __timer_getoverrun
 __timer_gettime
 __timer_settime
+__umask_chk
 __vsnprintf_chk
 __vsprintf_chk
 __waitid
@@ -240,6 +243,7 @@ fdopendir
 feof
 ferror
 fflush
+ffs
 fgetc
 fgetln
 fgetpos
@@ -296,11 +300,13 @@ fwrite
 fwscanf
 gai_strerror
 getaddrinfo
+getauxval
 getc
 getc_unlocked
 getchar
 getchar_unlocked
 getcwd
+getdelim
 getegid
 getenv
 geteuid
@@ -316,6 +322,7 @@ gethostbyname_r
 gethostent
 gethostname
 getitimer
+getline
 getlogin
 getmntent
 getnameinfo
@@ -676,6 +683,7 @@ sigaltstack
 sigblock
 siginterrupt
 siglongjmp
+signalfd
 sigpending
 sigprocmask
 sigsetjmp

ndk/platforms/android-19/arch-x86/symbols/libc.so.versions.txt

@@ -125,12 +125,14 @@ LIBC {
     __stack_chk_guard;
     __statfs64; # arm x86 mips
     __strcat_chk;
+    __strchr_chk;
     __strcpy_chk;
     __strlcat_chk;
     __strlcpy_chk;
     __strlen_chk;
     __strncat_chk;
     __strncpy_chk;
+    __strrchr_chk;
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
@@ -146,6 +148,7 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
     __waitid; # arm x86 mips
@@ -254,6 +257,7 @@ LIBC {
     feof;
     ferror;
     fflush;
+    ffs;
     fgetc;
     fgetln;
     fgetpos;
@@ -310,11 +314,13 @@ LIBC {
     fwscanf;
     gai_strerror;
     getaddrinfo;
+    getauxval;
     getc;
     getc_unlocked;
     getchar;
     getchar_unlocked;
     getcwd;
+    getdelim;
     getegid;
     getenv;
     geteuid;
@@ -330,6 +336,7 @@ LIBC {
     gethostent;
     gethostname;
     getitimer;
+    getline;
     getlogin;
     getmntent;
     getnameinfo;
@@ -695,6 +702,7 @@ LIBC {
     sigblock;
     siginterrupt;
     siglongjmp;
+    signalfd;
     sigpending;
     sigprocmask;
     sigsetjmp;