Remove the legacy endusershell/getusershell/setusershell stubs.

These don't work, aren't thread-safe, aren't in POSIX (or our header
files), and are only used by one app (whose developers I've contacted).
But the presence of these symbols causes configure to be confused, which
is a pain for Brillo.

Bug: http://b/24812426
Change-Id: I7fa6ef82864d5563929d9b8a7f8fcacb30b26d45

diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index e7e20d1..231cf10 100644 (file)
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -359,18 +359,8 @@ extern "C" pthread_internal_t* __get_thread() {
 
 #endif // !defined(__LP64__)
 
-// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
-extern "C" char* getusershell() {
-  return NULL;
-}
-
-// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
-extern "C" void setusershell() { }
-
-// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
-extern "C" void endusershell() { }
-
-// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
+// This was never implemented in bionic, only needed for ABI compatibility with the NDK.
+// In the M time frame, over 1000 apps have a reference to this!
 extern "C" void endpwent() { }
 
 // Since dlmalloc_inspect_all and dlmalloc_trim are exported for systems

diff --git a/libc/libc.map b/libc/libc.map
index bb67b5c..b0f7030 100644 (file)
--- a/libc/libc.map
+++ b/libc/libc.map
@@ -389,7 +389,6 @@ LIBC {
     endmntent;
     endpwent;
     endservent;
-    endusershell;
     endutent;
     environ;
     epoll_create;
@@ -580,7 +579,6 @@ LIBC {
     gettid;
     gettimeofday;
     getuid;
-    getusershell;
     getutent;
     getwc;
     getwchar;
@@ -1051,7 +1049,6 @@ LIBC {
     setstate;
     settimeofday;
     setuid;
-    setusershell;
     setutent;
     setvbuf;
     setxattr;