From 0900bfbcc57c555909cb75c38eb0ed26fb6964ef Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Wed, 25 Jan 2023 18:44:47 +0800
Subject: Update Android port

* doc/emacs/android.texi (Android Startup, Android Environment):
Document that restrictions on starting Emacs have been lifted.

* java/README: Document Java for Emacs developers and how the
Android port works.

* java/org/gnu/emacs/EmacsApplication.java (EmacsApplication)
(findDumpFile): New function.
(onCreate): Factor out dump file finding functions to there.

* java/org/gnu/emacs/EmacsNative.java (EmacsNative): Update
function declarations.
* java/org/gnu/emacs/EmacsNoninteractive.java
(EmacsNoninteractive): New class.

* java/org/gnu/emacs/EmacsService.java (EmacsService, getApkFile)
(onCreate): Pass classpath to setEmacsParams.
* java/org/gnu/emacs/EmacsThread.java (EmacsThread): Make run an
override.
* lisp/loadup.el: Don't dump on Android when noninteractive.
* lisp/shell.el (shell--command-completion-data): Handle
inaccessible directories.
* src/Makefile.in (android-emacs): Link with gnulib.
* src/android-emacs.c (main): Implement to launch app-process
and then EmacsNoninteractive.
* src/android.c (setEmacsParams): New argument `class_path'.
Don't set stuff up when running noninteractive.
* src/android.h (initEmacs): Likewise.
* src/androidfont.c (init_androidfont):
* src/androidselect.c (init_androidselect): Don't initialize
when running noninteractive.
* src/emacs.c (load_pdump): New argument `dump_file'.
(android_emacs_init): Give new argument `dump_file' to
`load_pdump'.
* src/sfntfont-android.c (init_sfntfont_android): Don't
initialize when running noninteractive.
---
 java/org/gnu/emacs/EmacsThread.java | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'java/org/gnu/emacs/EmacsThread.java')

diff --git a/java/org/gnu/emacs/EmacsThread.java b/java/org/gnu/emacs/EmacsThread.java
index 5b76d11db4b..f5e9d54044a 100644
--- a/java/org/gnu/emacs/EmacsThread.java
+++ b/java/org/gnu/emacs/EmacsThread.java
@@ -33,30 +33,18 @@ public class EmacsThread extends Thread
     this.startDashQ = startDashQ;
   }
 
+  @Override
   public void
   run ()
   {
     String args[];
 
-    if (EmacsApplication.dumpFileName == null)
-      {
-	if (!startDashQ)
-	  args = new String[] { "libandroid-emacs.so", };
-	else
-	  args = new String[] { "libandroid-emacs.so", "-Q", };
-      }
+    if (!startDashQ)
+      args = new String[] { "libandroid-emacs.so", };
     else
-      {
-	if (!startDashQ)
-	  args = new String[] { "libandroid-emacs.so", "--dump-file",
-	                        EmacsApplication.dumpFileName, };
-	else
-	  args = new String[] { "libandroid-emacs.so", "-Q",
-				"--dump-file",
-				EmacsApplication.dumpFileName, };
-      }
+      args = new String[] { "libandroid-emacs.so", "-Q", };
 
     /* Run the native code now.  */
-    EmacsNative.initEmacs (args);
+    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName);
   }
 };
-- 
cgit v1.3