Update Android port

* .gitignore: Update with new files.  Do not ignore std*.in.h.
* INSTALL.android: Explain how to build Emacs with external
dependencies.

* Makefile.in (xcompile, cross): Rename to `cross'.
(clean_dirs): Clean cross, not xcompile.

* README: Document new directories.

* build-aux/ndk-build-helper-1.mk (build_kind, NDK_SO_NAMES):
* build-aux/ndk-build-helper-2.mk (build_kind, NDK_SO_NAMES):
* build-aux/ndk-build-helper-3.mk (build_kind):
* build-aux/ndk-build-helper-4.mk:
* build-aux/ndk-build-helper.mk (NDK_BUILD_DIR, my-dir):
* build-aux/ndk-module-extract.awk: New files.
* configure.ac: Set up libgif, libwebp, and libpng for
ndk-build.
* cross/ndk-build/Makefile.in (srcdir, NDK_BUILD_ANDROID_MK):
* cross/ndk-build/ndk-build-executable.mk:
* cross/ndk-build/ndk-build-shared-library.mk (eq, objname):
* cross/ndk-build/ndk-build-static-library.mk (eq, objname):
* cross/ndk-build/ndk-build.in (NDK_BUILD_MODULES):
* cross/ndk-build/ndk-build.mk.in (NDK_BUILD_MODULES)
(NDK_BUILD_SHARED):
* cross/ndk-build/ndk-clear-vars.mk:
* cross/ndk-build/ndk-prebuilt-shared-library.mk:
* cross/ndk-build/ndk-prebuilt-static-library.mk: New files.
* doc/emacs/android.texi (Android, Android Environment):
Document clipboard support on Android.
* doc/emacs/emacs.texi (Top): Update menus.
* etc/MACHINES: Document Android.
* java/AndroidManifest.xml.in: Respect new
`--with-android-debug' option.
* java/Makefile.in (CROSS_BINS, CROSS_LIBS): Adjust for rename.
Include ndk-build.mk.:(emacs.apk-in): Depend on shared
libraries.  Then, package shared libraries.
* java/org/gnu/emacs/EmacsClipboard.java (EmacsClipboard): New
class.
* java/org/gnu/emacs/EmacsFontDriver.java: Update comment to say
this is unused.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function `sendExpose'.
* java/org/gnu/emacs/EmacsSdk11Clipboard.java
(EmacsSdk11Clipboard):
* java/org/gnu/emacs/EmacsSdk8Clipboard.java
(EmacsSdk8Clipboard): New classes.
* java/org/gnu/emacs/EmacsView.java (EmacsView, handleDirtyBitmap)
(onDetachedFromWindow): When window is reattached, expose the
frame.

* lib/Makefile.in (VPATH):
(ALL_CFLAGS): Adjust for rename.

* lisp/term/android-win.el (android-clipboard-exists-p)
(android-get-clipboard, android-set-clipboard)
(android-clipboard-owner-p, android-primary-selection)
(android-get-clipboard-1, android-get-primary)
(android-selection-bounds, android-encode-select-string)
(gui-backend-get-selection, gui-backend-selection-exists-p)
(gui-backend-selection-owner-p, gui-backend-set-selection): New
functions.

* m4/ndk-build.m4: New file.
* src/Makefile.in (GIF_CFLAGS, ANDROID_LDFLAGS): New variables.
(EMACS_CFLAGS): Add GIF_CFLAGS.  Include
ndk-build.mk.
(libemacs.so): Depend on and link with required
libraries.

* src/android.c (android_check_compressed_file): New function.
(android_open): Work around Android platform bug.
(sendExpose): New function.
(android_readdir): Set d_type if this is a directory.

* src/androidgui.h (enum android_event_type)
(struct android_expose_event, union android_event): Add expose
events.

* src/androidselect.c (struct android_emacs_clipboard)
(android_init_emacs_clipboard, Fandroid_clipboard_owner_p)
(Fandroid_set_clipboard, Fandroid_get_clipboard)
(Fandroid_clipboard_exists_p, init_androidselect)
(syms_of_androidselect): New file.

* src/androidterm.c (handle_one_android_event): Handle
exposures.
* src/androidterm.h: Update prototypes.
* src/emacs.c (android_emacs_init): Initialize androidselect.

1 files changed, 213 insertions, 0 deletions

diff --git a/m4/ndk-build.m4 b/m4/ndk-build.m4
new file mode 100644
index 00000000000..a35900884d9
--- /dev/null
+++ b/m4/ndk-build.m4
@@ -0,0 +1,213 @@
+dnl Copyright (C) 2023 Free Software Foundation, Inc.
+dnl This file is part of GNU Emacs.
+
+dnl GNU Emacs is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+
+dnl GNU Emacs is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+# Support for building Emacs with dependencies using the Android NDK
+# build system.
+
+AC_ARG_WITH([ndk_path],
+  [AS_HELP_STRING([--with-ndk-path],
+    [find Android libraries in these directories])])
+
+# ndk_INIT(ABI, API, DIR)
+# --------
+# Initialize the Android NDK.  ABI is the ABI being built for.
+# API is the API version being built for.
+# As a side effect, set the variable ndk_INITIALIZED to true.
+# DIR should be a directory containing the Makefile.in actually
+# implementing the Android NDK build system.
+
+AC_DEFUN_ONCE([ndk_INIT],
+[
+# Look for Android.mk files.
+ndk_module_files=
+for file in $with_ndk_path; do
+  if test -f $file/Android.mk; then
+    ndk_module_files="$ndk_module_files$file/Android.mk "
+  fi
+done
+
+ndk_ABI=$1
+ndk_MODULES=
+ndk_MAKEFILES=
+ndk_INITIALIZED=yes
+ndk_API=$2
+ndk_DIR=$3
+
+case "$ndk_ABI" in
+ *arm64* )
+   ndk_ARCH=arm64
+   ;;
+ *arm* )
+   ndk_ARCH=arm
+   ;;
+ *x86_64* )
+   ndk_ARCH=x86_64
+   ;;
+ *x86* )
+   ndk_ARCH=x86
+   ;;
+ * )
+   AC_MSG_ERROR([Failed to determine Android device architecture])
+   ;;
+esac
+
+# This is a map between pkg-config style package names and Android
+# ones.
+
+ndk_package_map="libwebpdemux:webpdemux libxml-2.0:libxml2"
+
+# Replace ndk_module with the appropriate Android module name if it is
+# found in ndk_package_map.
+
+ndk_replace_pkg_config_package () {
+  for ndk_stuff in $ndk_package_map; do
+    ndk_key=${ndk_stuff%%:*}
+    ndk_value=${ndk_stuff#*:}
+
+    if test "$ndk_key" = "$ndk_module"; then
+      ndk_module="$ndk_value"
+      break
+    fi
+  done
+}
+
+# Parse a pkg-config style list of modules.  Place the resulting list
+# in ndk_modules.
+
+ndk_parse_pkg_config_string () {
+  ndk_input=[$]1
+  ndk_modules=
+  while test -n "$ndk_input"; do
+    ndk_str=$(printf "$ndk_input" | cut -f1 -d' ')
+    ndk_input="$(printf "$ndk_input" | cut -s -f2- -d' ')"
+
+    if test "$ndk_str" = ">=" || test "$ndk_str" = "<=" \
+      || test "$ndk_str" = ">" || test "$ndk_str" = "<"; then
+      ndk_input="$(printf "$ndk_input" | cut -s -f2- -d' ')"
+    else
+      ndk_modules="$ndk_modules$ndk_str "
+    fi
+  done
+}
+
+# Look for a suitable ar in the same directory as the C compiler.
+ndk_where_cc=$(which $CC)
+ndk_ar_search_path=$PATH
+
+# First, try to find $host_alias-ar in PATH.
+AC_PATH_PROGS([AR], [$host_alias-ar], [], [$ndk_ar_search_path])
+
+if test -z "$AR"; then
+  # Next, try finding either that or llvm-ar in the directory holding
+  # CC.
+  ndk_ar_search_path="$(dirname $ndk_where_cc):$ndk_ar_search_path"
+  AC_PATH_PROGS([AR], [$host_alias-ar llvm-ar], [], [$ndk_ar_search_path])
+fi
+
+# These variables have now been found.
+])
+
+# ndk_SEARCH_MODULE(MODULE, NAME, ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND])
+# --------------------------------------------------------------------
+# Search for a module named MODULE in `with_ndk_path'.  Add the file
+# name of the module's Android.mk file to the variable ndk_MODULES.
+# Set NAME_CFLAGS and NAME_LIBS to the appropriate values.  Then,
+# call ACTION-IF-FOUND, or ACTION-IF-NOT-FOUND upon failure.
+AC_DEFUN([ndk_SEARCH_MODULE],
+[
+module_name=
+ndk_module=$1
+ndk_replace_pkg_config_package
+AC_MSG_CHECKING([for Android.mk that builds $ndk_module])
+
+for ndk_android_mk in $ndk_module_files; do
+  # Read this Android.mk file.  Set NDK_ROOT to /tmp: the Android in
+  # tree build system sets it to a meaning value, but build files just
+  # use it to test whether or not the NDK is being used.
+  ndk_commands=$(make -s -f build-aux/ndk-build-helper.mk EMACS_SRCDIR=.     \
+		 EMACS_ABI=$ndk_ABI ANDROID_MAKEFILE="$ndk_android_mk"       \
+	         ANDROID_MODULE_DIRECTORY=$(dirname "$ndk_android_mk")       \
+	         NDK_BUILD_DIR="$ndk_DIR" NDK_ROOT="/tmp"		     \
+	         | awk -f build-aux/ndk-module-extract.awk 		     \
+		 MODULE="$ndk_module")
+
+  AS_IF([test -n "${ndk_commands//\n }"], [eval "$ndk_commands"])
+
+  if test -n "$module_name"; then
+    break
+  fi
+done
+
+if test -z "$module_name"; then
+  AC_MSG_RESULT([no])
+  $4
+else
+  $2[]_CFLAGS="[$]$2[]_CFLAGS $module_cflags $module_includes"
+  $2[]_LIBS="[$]$2[]_LIBS $module_ldflags"
+  ndk_MAKEFILES="$ndk_MAKEFILES $ndk_android_mk"
+  ndk_MODULES="$ndk_MODULES $module_target"
+  AC_MSG_RESULT([yes])
+  $3
+fi
+])
+
+# ndk_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+#   [ACTION-IF-NOT-FOUND])
+# --------------------------------------------------------------
+# Just like `PKG_CHECK_MODULES'.  However, it uses the ndk-build
+# system instead.
+
+AC_DEFUN([ndk_CHECK_MODULES],
+[
+  ndk_modules=
+  ndk_parse_pkg_config_string "$2"
+  ndk_found=no
+
+  for module in $ndk_modules; do
+    ndk_SEARCH_MODULE([$module], [$1], [ndk_found=yes], [ndk_found=no])
+  done
+
+  AS_IF([test "$ndk_found" = "yes"],[$3],[$4])
+])
+
+# ndk_CONFIG_FILES
+# -------------------------------------------------------------
+# Write out the NDK build Makefile with the appropriate variables
+# set if the NDK has been initialized.
+
+AC_DEFUN_ONCE([ndk_CONFIG_FILES],
+[
+  if test "$ndk_INITIALIZED" = "yes"; then
+    NDK_BUILD_ANDROID_MK="$ndk_MAKEFILES"
+    NDK_BUILD_ARCH=$ndk_ARCH
+    NDK_BUILD_ABI=$ndk_ABI
+    NDK_BUILD_SDK=$ndk_API
+    NDK_BUILD_CC=$CC
+    NDK_BUILD_AR=$AR
+    NDK_BUILD_MODULES="$ndk_MODULES"
+
+    AC_SUBST([NDK_BUILD_ANDROID_MK])
+    AC_SUBST([NDK_BUILD_ARCH])
+    AC_SUBST([NDK_BUILD_ABI])
+    AC_SUBST([NDK_BUILD_SDK])
+    AC_SUBST([NDK_BUILD_CC])
+    AC_SUBST([NDK_BUILD_AR])
+    AC_SUBST([NDK_BUILD_MODULES])
+
+    AC_CONFIG_FILES([$ndk_DIR/Makefile])
+    AC_CONFIG_FILES([$ndk_DIR/ndk-build.mk])
+  fi
+])