Update Android port

* INSTALL.android: Update.
* build-aux/ndk-build-helper-1.mk: Fix typo.
* configure.ac: Enable --with-json on Android.
* cross/ndk-build/ndk-build-shared-library.mk:
(NDK_CFLAGS_$(LOCAL_MODULE)):
(LOCAL_MODULE_FILENAME):
* cross/ndk-build/ndk-build-static-library.mk:
(ALL_OBJECT_FILES$(LOCAL_MODULE)):
(LOCAL_MODULE_FILENAME): Recursively resolve dependencies.
* cross/ndk-build/ndk-resolve.mk: New function.

* doc/emacs/android.texi (Android Startup): Document how Emacs
is dumped during initial startup.

* java/Makefile.in (filename): Fix build with multiple shared
libraries.
* java/README: Improve commentary.
* java/org/gnu/emacs/EmacsApplication.java (onCreate): Look and
set dump file.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function getFingerprint.
* java/org/gnu/emacs/EmacsPreferencesActivity.java (onCreate):
Add option to erase the dump file.
* java/org/gnu/emacs/EmacsService.java (browseUrl): New
function.
* java/org/gnu/emacs/EmacsThread.java (run): Specify dump file
if found.
* lisp/loadup.el: Always dump during loadup on Android.

* lisp/net/browse-url.el (browse-url--browser-defcustom-type):
(browse-url-default-browser):
(browse-url-default-android-browser): New browse url type.

* m4/ndk-build.m4 (ndk_package_map): Map jansson to libjansson.
* src/android.c (struct android_emacs_service): New method
`browse_url'.
(getFingerprint): New function.
(android_init_emacs_service): Initialize new method.
(android_browse_url): New function.

* src/android.h: Update prototypes.

* src/androidselect.c (Fandroid_browse_url): New function.
(syms_of_androidselect): Define it.

* src/emacs.c (load_pdump): Don't look in fancy places on
Android.
* src/pdumper.c (Fdump_emacs_portable): Allow dumping while
interactive on Android.
(syms_of_pdumper): New variable `pdumper-fingerprint'.

* src/sfntfont-android.c (sfntfont_android_composite_bitmap):
Fix unused variables.

6 files changed, 137 insertions, 2 deletions

diff --git a/src/android.c b/src/android.c
index d788c6f19b4..c186b462360 100644
--- a/src/android.c
+++ b/src/android.c
@@ -33,6 +33,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <sys/param.h>
 
 #include <assert.h>
+#include <fingerprint.h>
 
 #include "android.h"
 #include "androidgui.h"
@@ -95,6 +96,7 @@ struct android_emacs_service
   jmethodID detect_mouse;
   jmethodID name_keysym;
   jmethodID sync;
+  jmethodID browse_url;
 };
 
 struct android_emacs_pixmap
@@ -1294,6 +1296,18 @@ android_get_home_directory (void)
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
 #endif
 
+JNIEXPORT jstring JNICALL
+NATIVE_NAME (getFingerprint) (JNIEnv *env, jobject object)
+{
+  char buffer[sizeof fingerprint * 2 + 1];
+
+  memset (buffer, 0, sizeof buffer);
+  hexbuf_digest (buffer, (char *) fingerprint,
+                 sizeof fingerprint);
+
+  return (*env)->NewStringUTF (env, buffer);
+}
+
 JNIEXPORT void JNICALL
 NATIVE_NAME (setEmacsParams) (JNIEnv *env, jobject object,
                               jobject local_asset_manager,
@@ -1514,6 +1528,8 @@ android_init_emacs_service (void)
   FIND_METHOD (detect_mouse, "detectMouse", "()Z");
   FIND_METHOD (name_keysym, "nameKeysym", "(I)Ljava/lang/String;");
   FIND_METHOD (sync, "sync", "()V");
+  FIND_METHOD (browse_url, "browseUrl", "(Ljava/lang/String;)"
+               "Ljava/lang/String;");
 #undef FIND_METHOD
 }
 
@@ -4735,6 +4751,51 @@ android_project_image_nearest (struct android_image *image,
 
 
 
+/* Other miscellaneous functions.  */
+
+/* Ask the system to start browsing the specified encoded URL.  Upon
+   failure, return a string describing the error.  Else, value is
+   nil.  */
+
+Lisp_Object
+android_browse_url (Lisp_Object url)
+{
+  jobject value, string;
+  Lisp_Object tem;
+  const char *buffer;
+
+  string = android_build_string (url);
+  value = (*android_java_env)->CallObjectMethod (android_java_env,
+                                                 emacs_service,
+                                                 service_class.browse_url,
+                                                 string);
+  android_exception_check ();
+
+  ANDROID_DELETE_LOCAL_REF (string);
+
+  /* If no string was returned, return Qnil.  */
+  if (!value)
+    return Qnil;
+
+  buffer = (*android_java_env)->GetStringUTFChars (android_java_env,
+                                                   (jstring) value,
+                                                   NULL);
+  android_exception_check ();
+
+  /* Otherwise, build the string describing the error.  */
+  tem = build_string_from_utf8 (buffer);
+
+  (*android_java_env)->ReleaseStringUTFChars (android_java_env,
+                                              (jstring) value,
+                                              buffer);
+
+  /* And return it.  */
+  ANDROID_DELETE_LOCAL_REF (value);
+  return tem;
+}
+
+
+
 #else /* ANDROID_STUBIFY */
 
 /* X emulation functions for Android.  */
diff --git a/src/android.h b/src/android.h
index eee3a7a6498..ce0ccfc4338 100644
--- a/src/android.h
+++ b/src/android.h
@@ -107,6 +107,10 @@ extern void android_closedir (struct android_dir *);
 
 
 
+/* Very miscellaneous functions.  */
+
+extern Lisp_Object android_browse_url (Lisp_Object);
+
 #endif
 
 /* JNI functions should not be built when Emacs is stubbed out for the
diff --git a/src/androidselect.c b/src/androidselect.c
index 4a71b376e28..2e2f2d7e483 100644
--- a/src/androidselect.c
+++ b/src/androidselect.c
@@ -213,6 +213,25 @@ DEFUN ("android-clipboard-exists-p", Fandroid_clipboard_exists_p,
   return rc ? Qt : Qnil;
 }
 
+DEFUN ("android-browse-url", Fandroid_browse_url,
+       Sandroid_browse_url, 1, 1, 0,
+       doc: /* Start the system web browser.
+Then, point the web browser to URL, which should be a URL-encoded
+URL with a scheme specified.  Signal an error upon failure.  */)
+  (Lisp_Object url)
+{
+  Lisp_Object value;
+
+  CHECK_STRING (url);
+  value = android_browse_url (url);
+
+  /* Signal an error upon failure.  */
+  if (!NILP (value))
+    signal_error ("Error browsing URL", value);
+
+  return Qnil;
+}
+
 
 
 void
@@ -246,4 +265,5 @@ syms_of_androidselect (void)
   defsubr (&Sandroid_set_clipboard);
   defsubr (&Sandroid_get_clipboard);
   defsubr (&Sandroid_clipboard_exists_p);
+  defsubr (&Sandroid_browse_url);
 }
diff --git a/src/emacs.c b/src/emacs.c
index 02016e53c45..b0c19fe0070 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -744,6 +744,8 @@ argmatch (char **argv, int argc, const char *sstr, const char *lstr,
     }
 }
 
+#if !defined HAVE_ANDROID || defined ANDROID_STUBIFY
+
 /* Find a name (absolute or relative) of the Emacs executable whose
    name (as passed into this program) is ARGV0.  Called early in
    initialization by portable dumper loading code, so avoid Lisp and
@@ -843,6 +845,8 @@ find_emacs_executable (char const *argv0, ptrdiff_t *candidate_size)
 #endif  /* !WINDOWSNT */
 }
 
+#endif
+
 #ifdef HAVE_PDUMPER
 
 static const char *
@@ -875,6 +879,30 @@ dump_error_to_string (int result)
 static char *
 load_pdump (int argc, char **argv)
 {
+#if defined HAVE_ANDROID && !defined ANDROID_STUBIFY
+  char *dump_file = NULL;
+  int skip_args = 0, result;
+
+  while (skip_args < argc - 1)
+    {
+      if (argmatch (argv, argc, "-dump-file", "--dump-file", 6,
+                    &dump_file, &skip_args)
+          || argmatch (argv, argc, "--", NULL, 2, NULL, &skip_args))
+        break;
+      skip_args++;
+    }
+
+  if (!dump_file)
+    return argv[0];
+
+  result = pdumper_load (dump_file, argv[0]);
+
+  if (result != PDUMPER_LOAD_SUCCESS)
+    fatal ("could not load dump file \"%s\": %s",
+           dump_file, dump_error_to_string (result));
+  return argv[0];
+#else
+
   const char *const suffix = ".pdmp";
   int result;
   char *emacs_executable = argv[0];
@@ -1067,6 +1095,7 @@ load_pdump (int argc, char **argv)
   xfree (dump_file);
 
   return emacs_executable;
+#endif
 }
 #endif /* HAVE_PDUMPER */
 
diff --git a/src/pdumper.c b/src/pdumper.c
index eca64725211..dbdeae9a799 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4072,10 +4072,12 @@ types.  */)
 {
   eassert (initialized);
 
+#ifndef HAVE_ANDROID
   if (! noninteractive)
     error ("Dumping Emacs currently works only in batch mode.  "
            "If you'd like it to work interactively, please consider "
            "contributing a patch to Emacs.");
+#endif
 
   if (will_dump_with_unexec_p ())
     error ("This Emacs instance was started under the assumption "
@@ -5842,6 +5844,10 @@ void
 syms_of_pdumper (void)
 {
 #ifdef HAVE_PDUMPER
+  unsigned char desired[sizeof fingerprint];
+  int i;
+  char hexbuf[2 * sizeof fingerprint];
+
   defsubr (&Sdump_emacs_portable);
   defsubr (&Sdump_emacs_portable__sort_predicate);
   defsubr (&Sdump_emacs_portable__sort_predicate_copied);
@@ -5854,5 +5860,17 @@ syms_of_pdumper (void)
   DEFSYM (Qdump_file_name, "dump-file-name");
   DEFSYM (Qafter_pdump_load_hook, "after-pdump-load-hook");
   defsubr (&Spdumper_stats);
+
+  for (i = 0; i < sizeof fingerprint; i++)
+    desired[i] = fingerprint[i];
+
+  hexbuf_digest (hexbuf, desired, sizeof desired);
+
+  DEFVAR_LISP ("pdumper-fingerprint", Vpdumper_fingerprint,
+               doc: /* The fingerprint of this Emacs binary.
+It is a string that is supposed to be unique to each build of
+Emacs.  */);
+  Vpdumper_fingerprint = make_unibyte_string ((char *) hexbuf,
+                                              sizeof hexbuf);
 #endif /* HAVE_PDUMPER */
 }
diff --git a/src/sfntfont-android.c b/src/sfntfont-android.c
index 5c9835fb13e..bc8f1b35b84 100644
--- a/src/sfntfont-android.c
+++ b/src/sfntfont-android.c
@@ -320,7 +320,10 @@ sfntfont_android_composite_bitmap (unsigned char *restrict buffer,
 {
   unsigned int *src_row;
   unsigned int *dst_row;
-  unsigned int i, src_y, x, src_x, max_x, dst_x, lim_x;
+  unsigned int i, src_y, x, src_x, max_x, dst_x;
+#ifdef __aarch64__
+  unsigned int lim_x;
+#endif
 
   if ((intptr_t) dest & 3 || bitmap_info->stride & 3)
     /* This shouldn't be possible as Android is supposed to align the
@@ -353,10 +356,10 @@ sfntfont_android_composite_bitmap (unsigned char *restrict buffer,
               src_x = x + (rect->x - text_rectangle->x);
               dst_x = x + rect->x;
 
+#ifdef __aarch64__
               /* This is the largest value of src_x.  */
               lim_x = max_x + (rect->x - text_rectangle->x);
 
-#ifdef __aarch64__
               if (!sfntfont_android_over_8888 (src_row + src_x,
                                                dst_row + dst_x,
                                                src_row + lim_x,