From 1a3e15aaf5b7a0d913b61267079b849368d0ce95 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Wed, 16 Dec 2015 16:38:32 -0800 Subject: [PATCH] Remove symbols that are not present in platform libc Bug: http://b/26236057 Change-Id: If317bf196f15a23e94b6e5469d9e7eabfb68fb07 --- .../android-21/arch-arm/symbols/libc.so.functions.txt | 4 ---- .../android-21/arch-arm64/symbols/libc.so.functions.txt | 4 ---- .../android-21/arch-mips/symbols/libc.so.functions.txt | 4 ---- .../android-21/arch-mips64/symbols/libc.so.functions.txt | 4 ---- .../android-21/arch-x86/symbols/libc.so.functions.txt | 4 ---- .../android-21/arch-x86_64/symbols/libc.so.functions.txt | 4 ---- ndk/platforms/android-21/include/unistd.h | 5 ----- 7 files changed, 29 deletions(-) diff --git a/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt index 25d1a938a..d211ffb3b 100644 --- a/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt @@ -137,7 +137,6 @@ __res_nsend __res_ownok __res_queriesmatch __res_querydomain -__res_randomid __res_send __res_send_setqhook __res_send_setrhook @@ -309,7 +308,6 @@ duplocale endmntent endpwent endservent -endusershell endutent epoll_create epoll_create1 @@ -481,7 +479,6 @@ getsockopt gettid gettimeofday getuid -getusershell getutent getwc getwchar @@ -904,7 +901,6 @@ setsockopt setstate settimeofday setuid -setusershell setutent setvbuf setxattr diff --git a/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt index 35dc9b1ad..5d4560003 100644 --- a/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt @@ -79,7 +79,6 @@ __res_nsend __res_ownok __res_queriesmatch __res_querydomain -__res_randomid __res_send __res_send_setqhook __res_send_setrhook @@ -208,7 +207,6 @@ duplocale endmntent endpwent endservent -endusershell endutent epoll_create epoll_create1 @@ -376,7 +374,6 @@ getsockopt gettid gettimeofday getuid -getusershell getutent getwc getwchar @@ -782,7 +779,6 @@ setsockopt setstate settimeofday setuid -setusershell setutent setvbuf setxattr diff --git a/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt index 382e5b649..3266392d4 100644 --- a/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt @@ -107,7 +107,6 @@ __res_nsend __res_ownok __res_queriesmatch __res_querydomain -__res_randomid __res_send __res_send_setqhook __res_send_setrhook @@ -276,7 +275,6 @@ duplocale endmntent endpwent endservent -endusershell endutent epoll_create epoll_create1 @@ -448,7 +446,6 @@ getsockopt gettid gettimeofday getuid -getusershell getutent getwc getwchar @@ -870,7 +867,6 @@ setsockopt setstate settimeofday setuid -setusershell setutent setvbuf setxattr diff --git a/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt index 35dc9b1ad..5d4560003 100644 --- a/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt @@ -79,7 +79,6 @@ __res_nsend __res_ownok __res_queriesmatch __res_querydomain -__res_randomid __res_send __res_send_setqhook __res_send_setrhook @@ -208,7 +207,6 @@ duplocale endmntent endpwent endservent -endusershell endutent epoll_create epoll_create1 @@ -376,7 +374,6 @@ getsockopt gettid gettimeofday getuid -getusershell getutent getwc getwchar @@ -782,7 +779,6 @@ setsockopt setstate settimeofday setuid -setusershell setutent setvbuf setxattr diff --git a/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt index be7220e6c..73a4eb183 100644 --- a/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt @@ -107,7 +107,6 @@ __res_nsend __res_ownok __res_queriesmatch __res_querydomain -__res_randomid __res_send __res_send_setqhook __res_send_setrhook @@ -272,7 +271,6 @@ duplocale endmntent endpwent endservent -endusershell endutent epoll_create epoll_create1 @@ -444,7 +442,6 @@ getsockopt gettid gettimeofday getuid -getusershell getutent getwc getwchar @@ -866,7 +863,6 @@ setsockopt setstate settimeofday setuid -setusershell setutent setvbuf setxattr diff --git a/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt index 35dc9b1ad..5d4560003 100644 --- a/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt @@ -79,7 +79,6 @@ __res_nsend __res_ownok __res_queriesmatch __res_querydomain -__res_randomid __res_send __res_send_setqhook __res_send_setrhook @@ -208,7 +207,6 @@ duplocale endmntent endpwent endservent -endusershell endutent epoll_create epoll_create1 @@ -376,7 +374,6 @@ getsockopt gettid gettimeofday getuid -getusershell getutent getwc getwchar @@ -782,7 +779,6 @@ setsockopt setstate settimeofday setuid -setusershell setutent setvbuf setxattr diff --git a/ndk/platforms/android-21/include/unistd.h b/ndk/platforms/android-21/include/unistd.h index e108e6e3d..db6ad8232 100644 --- a/ndk/platforms/android-21/include/unistd.h +++ b/ndk/platforms/android-21/include/unistd.h @@ -90,11 +90,6 @@ extern int setresgid(gid_t, gid_t, gid_t); extern int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); extern int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); extern char* getlogin(void); -extern char* getusershell(void); -extern void setusershell(void); -extern void endusershell(void); - - /* Macros for access() */ #define R_OK 4 /* Read */