commit d9146c24041ad571e3725ab630d9ac94df3ff6d1
author Elliott Hughes <enh@google.com> Wed Oct 28 23:35:25 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 28 23:35:25 2015 +0000
tree 30fd7a1b17591746208305df6533788cf8227433
parent 1721be2229d07b5eea830f02a76e7be56d172aa9
parent d7c7daada276276e77446c099a67dd3ea15ea72e

Merge "Remove the legacy endusershell/getusershell/setusershell stubs."

libc/bionic/ndk_cruft.cpp

diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index e7e20d1..231cf10 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -359,18 +359,8 @@
 
 #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

libc/libc.map

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