Update Android port

* .gitignore: Ignore lib/math.h.
* INSTALL.android: Update accordingly.
* build-aux/ndk-build-helper-1.mk:
* build-aux/ndk-build-helper-2.mk:
* build-aux/ndk-build-helper.mk:
* build-aux/ndk-module-extract.awk: Handle C++ modules.
* configure.ac: Enable libxml2 on Android.

* cross/ndk-build/Makefile.in:
* cross/ndk-build/ndk-build-shared-library.mk:
* cross/ndk-build/ndk-build-static-library.mk:
* cross/ndk-build/ndk-build.mk.in:
* cross/ndk-build/ndk-resolve.mk: Fix dependency resolution of
includes.

* java/org/gnu/emacs/EmacsView.java (popupMenu): Fix minimum SDK
version for actual popup menus.
* lib/math.h: Delete file.

* m4/ndk-build.m4 (ndk_SEARCH_MODULE, ndk_CHECK_MODULES): Look
for nasm and C++ libraries.

* src/android.c (faccessat): Rename to `android_faccessat'.
* src/android.h: Update prototypes.
* src/dired.c (file_name_completion_dirp):
* src/fileio.c (file_access_p, Faccess_file, file_directory_p):
* src/lisp.h:
* src/lread.c (openp):
* src/process.c (allocate_pty): Use sys_faccessat.
* src/sysdep.c (sys_faccessat): New function.

8 files changed, 38 insertions, 18 deletions

diff --git a/src/android.c b/src/android.c
index 2f21a03b53f..52de153eefd 100644
--- a/src/android.c
+++ b/src/android.c
@@ -4214,30 +4214,34 @@ android_window_updated (android_window window, unsigned long serial)
 
 
 
-#if __ANDROID_API__ >= 17
-
-#undef faccessat
+#if __ANDROID_API__ >= 16
 
 /* Replace the system faccessat with one which understands AT_EACCESS.
    Android's faccessat simply fails upon using AT_EACCESS, so replace
    it with zero here.  This isn't caught during configuration.
 
-   This replacement is only done when building for Android 17 or
+   This replacement is only done when building for Android 16 or
    later, because earlier versions use the gnulib replacement that
    lacks these issues.  */
 
 int
-faccessat (int dirfd, const char *pathname, int mode, int flags)
+android_faccessat (int dirfd, const char *pathname, int mode, int flags)
 {
-  static int (*real_faccessat) (int, const char *, int, int);
+  return faccessat (dirfd, pathname, mode, flags & ~AT_EACCESS);
+}
+
+#else /* __ANDROID_API__ < 16 */
 
-  if (!real_faccessat)
-    real_faccessat = dlsym (RTLD_NEXT, "faccessat");
+/* This is unnecessary on earlier API versions, as gnulib's
+   rpl_faccessat will be used instead.  */
 
-  return real_faccessat (dirfd, pathname, mode, flags & ~AT_EACCESS);
+int
+android_faccessat (int dirfd, const char *pathname, int mode, int flags)
+{
+  return faccessat (dirfd, pathname, mode, flags);
 }
 
-#endif /* __ANDROID_API__ >= 17 */
+#endif
 
 
 
diff --git a/src/android.h b/src/android.h
index 6c20995e4a1..33fad512d4a 100644
--- a/src/android.h
+++ b/src/android.h
@@ -52,6 +52,7 @@ extern char *android_user_full_name (struct passwd *);
 extern int android_fstat (int, struct stat *);
 extern int android_fstatat (int, const char *restrict,
                             struct stat *restrict, int);
+extern int android_faccessat (int, const char *, int, int);
 extern int android_close (int);
 extern int android_fclose (FILE *);
 extern const char *android_get_home_directory (void);
diff --git a/src/dired.c b/src/dired.c
index ced08a35643..b38416e981a 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -894,7 +894,8 @@ file_name_completion_dirp (int fd, struct dirent *dp, ptrdiff_t len)
     return true;
 #endif
 
-  bool dirp = faccessat (fd, subdir_name, F_OK, AT_EACCESS) == 0;
+  bool dirp = sys_faccessat (fd, subdir_name,
+                             F_OK, AT_EACCESS) == 0;
   SAFE_FREE ();
   return dirp;
 }
diff --git a/src/fileio.c b/src/fileio.c
index 492a43d74c3..6f25506dbc2 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -188,7 +188,7 @@ file_access_p (char const *file, int amode)
     return true;
 #endif
 
-  if (faccessat (AT_FDCWD, file, amode, AT_EACCESS) == 0)
+  if (sys_faccessat (AT_FDCWD, file, amode, AT_EACCESS) == 0)
     return true;
 
 #ifdef CYGWIN
@@ -3024,7 +3024,8 @@ If there is no error, returns nil.  */)
     return Qnil;
 #endif
 
-  if (faccessat (AT_FDCWD, SSDATA (encoded_filename), R_OK, AT_EACCESS) != 0)
+  if (sys_faccessat (AT_FDCWD, SSDATA (encoded_filename), R_OK,
+                     AT_EACCESS) != 0)
     report_file_error (SSDATA (string), filename);
 
   return Qnil;
@@ -3126,7 +3127,8 @@ file_directory_p (Lisp_Object file)
 {
 #ifdef DOS_NT
   /* This is cheaper than 'stat'.  */
-  bool retval = faccessat (AT_FDCWD, SSDATA (file), D_OK, AT_EACCESS) == 0;
+  bool retval = sys_faccessat (AT_FDCWD, SSDATA (file),
+                               D_OK, AT_EACCESS) == 0;
   if (!retval && errno == EACCES)
     errno = ENOTDIR;    /* like the non-DOS_NT branch below does */
   return retval;
diff --git a/src/lisp.h b/src/lisp.h
index f64a27ce113..6fda1e95503 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -5071,6 +5071,7 @@ extern int emacs_fstatat (int, char const *, void *, int);
 #ifdef HAVE_SYS_STAT_H
 extern int sys_fstat (int, struct stat *);
 #endif
+extern int sys_faccessat (int, const char *, int, int);
 #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY)
 extern int emacs_openat (int, char const *, int, int);
 #endif
diff --git a/src/lread.c b/src/lread.c
index d585dece392..6abcea556bf 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1964,8 +1964,8 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes,
                 fd = -1;
                 if (INT_MAX < XFIXNAT (predicate))
                   last_errno = EINVAL;
-                else if (faccessat (AT_FDCWD, pfn, XFIXNAT (predicate),
-                                    AT_EACCESS)
+                else if (sys_faccessat (AT_FDCWD, pfn, XFIXNAT (predicate),
+                                        AT_EACCESS)
                          == 0)
                   {
                     if (file_directory_p (encoded_fn))
@@ -1985,7 +1985,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes,
                     it.  Only open the file when we are sure that it
                     exists.  */
 #ifdef WINDOWSNT
-                if (faccessat (AT_FDCWD, pfn, R_OK, AT_EACCESS))
+                if (sys_faccessat (AT_FDCWD, pfn, R_OK, AT_EACCESS))
                   fd = -1;
                 else
 #endif
diff --git a/src/process.c b/src/process.c
index 651b5fa035b..9a8b0d7fd85 100644
--- a/src/process.c
+++ b/src/process.c
@@ -880,7 +880,8 @@ allocate_pty (char pty_name[PTY_NAME_SIZE])
 
             /* Check to make certain that both sides are available.
                This avoids a nasty yet stupid bug in rlogins.  */
-            if (faccessat (AT_FDCWD, pty_name, R_OK | W_OK, AT_EACCESS) != 0)
+            if (sys_faccessat (AT_FDCWD, pty_name,
+                               R_OK | W_OK, AT_EACCESS) != 0)
               {
                 emacs_close (fd);
                 continue;
diff --git a/src/sysdep.c b/src/sysdep.c
index 4d89d4f25ae..ac26b12e9a5 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2398,6 +2398,16 @@ sys_fstat (int fd, struct stat *statb)
 #endif
 }
 
+int
+sys_faccessat (int fd, const char *pathname, int mode, int flags)
+{
+#if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY)
+  return faccessat (fd, pathname, mode, flags);
+#else
+  return android_faccessat (fd, pathname, mode, flags);
+#endif
+}
+
 /* Assuming the directory DIRFD, open FILE for Emacs use,
    using open flags OFLAGS and mode MODE.
    Use binary I/O on systems that care about text vs binary I/O.