Update Android port

* configure.ac: Test for getpwent using gl_CHECK_FUNCS_ANDROID.
(bug#65319)

* etc/MACHINES (Android): Mention that a non-GUI build is also
possible on Android.

* lisp/loadup.el: Provide for regular builds on Android.
(bug#65339)

* lisp/wid-edit.el (widget-event-start): Remove function, since
event-start now does the same thing.
(widget-button--check-and-call-button, widget-button-click):
Adjust correspondingly.  Reported by Stefan Monnier
<monnier@iro.umontreal.ca>.

* src/sysdep.c (close_output_streams): Apply workarounds for the
file descriptor sanitizer on all builds where __ANDROID__ is
defined, not just Android port builds.  (bug#65340)

1 files changed, 8 insertions, 5 deletions

diff --git a/src/sysdep.c b/src/sysdep.c
index 0f8b70c8248..52fbfbd1eb1 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2972,14 +2972,16 @@ void
 close_output_streams (void)
 {
   /* Android comes with some kind of ``file descriptor sanitizer''
-     that aborts when stdout or stderr is closed.  */
+     that aborts when stdout or stderr is closed.  (bug#65340)
 
-#if defined HAVE_ANDROID && !defined ANDROID_STUBIFY
+     Perform this unconditionally as long as __ANDROID__ is defined,
+     since the file descriptor sanitizer also applies to regular TTY
+     builds under Android.  */
+
+#ifdef __ANDROID__
   fflush (stderr);
   fflush (stdout);
-  return;
-#endif
-
+#else /* !__ANDROID__ */
   if (close_stream (stdout) != 0)
     {
       emacs_perror ("Write error to standard output");
@@ -2993,6 +2995,7 @@ close_output_streams (void)
              ? fflush (stderr) != 0 || ferror (stderr)
              : close_stream (stderr) != 0))
     _exit (EXIT_FAILURE);
+#endif /* __ANDROID__ */
 }
 
 #ifndef DOS_NT