From 88afd96e36e62017c9c1f2229e2748b6dfbdb39a Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Fri, 17 Feb 2023 16:27:00 +0800
Subject: Fix build and running on Android 2.2

* INSTALL.android: Document that Android 2.2 is now supported,
with caveats.
* configure.ac (ANDROID_MIN_SDK, ANDROID_SDK_18_OR_EARLIER)
(SYSTEM_TYPE, ANDROID_STUBIFY, SIZEOF_LONG): Correctly detect
things missing on Android 2.2.
* java/Makefile.in (ANDROID_JAR, JARSIGNER_FLAGS):
* java/debug.sh (jdb, gdbserver, line):
* java/org/gnu/emacs/EmacsApplication.java (findDumpFile):
* java/org/gnu/emacs/EmacsService.java (onCreate):
* java/org/gnu/emacs/EmacsThread.java (EmacsThread, run): Run
parameter initialization on main thread.
* src/android-asset.h (struct android_asset_manager)
(struct android_asset, AAssetManager_fromJava, AAssetManager_open)
(AAsset_close, android_asset_create_stream)
(android_asset_read_internal, AAsset_openFileDescriptor)
(AAsset_getLength, AAsset_getBuffer, AAsset_read): New file.
* src/android.c (android_user_full_name, android_hack_asset_fd)
(android_check_compressed_file): Implement for Android 2.2.
* src/process.c (Fprocess_send_eof): Don't call tcdrain if
unavailable.
* src/sfntfont-android.c (system_font_directories): Fix compiler
warning.
* src/sfntfont.c (sfntfont_read_cmap): Correctly test rc of
emacs_open.
* src/textconv.c (handle_pending_conversion_events_1): Mark
buffer UNINIT.
---
 java/org/gnu/emacs/EmacsApplication.java |  1 +
 java/org/gnu/emacs/EmacsService.java     | 25 +++++++++++++++----------
 java/org/gnu/emacs/EmacsThread.java      |  9 ++++++++-
 3 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'java/org/gnu')

diff --git a/java/org/gnu/emacs/EmacsApplication.java b/java/org/gnu/emacs/EmacsApplication.java
index 96328b99d1c..6a065165eb1 100644
--- a/java/org/gnu/emacs/EmacsApplication.java
+++ b/java/org/gnu/emacs/EmacsApplication.java
@@ -49,6 +49,7 @@ public class EmacsApplication extends Application
        for a file named ``emacs-<fingerprint>.pdmp'' and delete the
        rest.  */
     filesDirectory = context.getFilesDir ();
+
     allFiles = filesDirectory.listFiles (new FileFilter () {
 	@Override
 	public boolean
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 2acb3ead086..4d373937ab0 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -180,11 +180,11 @@ public class EmacsService extends Service
   public void
   onCreate ()
   {
-    AssetManager manager;
+    final AssetManager manager;
     Context app_context;
-    String filesDir, libDir, cacheDir, classPath;
-    double pixelDensityX;
-    double pixelDensityY;
+    final String filesDir, libDir, cacheDir, classPath;
+    final double pixelDensityX;
+    final double pixelDensityY;
 
     SERVICE = this;
     handler = new Handler (Looper.getMainLooper ());
@@ -210,13 +210,18 @@ public class EmacsService extends Service
 	Log.d (TAG, "Initializing Emacs, where filesDir = " + filesDir
 	       + ", libDir = " + libDir + ", and classPath = " + classPath);
 
-	EmacsNative.setEmacsParams (manager, filesDir, libDir,
-				    cacheDir, (float) pixelDensityX,
-				    (float) pixelDensityY,
-				    classPath, this);
-
 	/* Start the thread that runs Emacs.  */
-	thread = new EmacsThread (this, needDashQ);
+	thread = new EmacsThread (this, new Runnable () {
+	    @Override
+	    public void
+	    run ()
+	    {
+	      EmacsNative.setEmacsParams (manager, filesDir, libDir,
+					  cacheDir, (float) pixelDensityX,
+					  (float) pixelDensityY,
+					  classPath, EmacsService.this);
+	    }
+	  }, needDashQ);
 	thread.start ();
       }
     catch (IOException exception)
diff --git a/java/org/gnu/emacs/EmacsThread.java b/java/org/gnu/emacs/EmacsThread.java
index 2724d838d41..30484710651 100644
--- a/java/org/gnu/emacs/EmacsThread.java
+++ b/java/org/gnu/emacs/EmacsThread.java
@@ -28,11 +28,16 @@ public class EmacsThread extends Thread
   /* Whether or not Emacs should be started -Q.  */
   private boolean startDashQ;
 
+  /* Runnable run to initialize Emacs.  */
+  private Runnable paramsClosure;
+
   public
-  EmacsThread (EmacsService service, boolean startDashQ)
+  EmacsThread (EmacsService service, Runnable paramsClosure,
+	       boolean startDashQ)
   {
     super ("Emacs main thread");
     this.startDashQ = startDashQ;
+    this.paramsClosure = paramsClosure;
   }
 
   @Override
@@ -46,6 +51,8 @@ public class EmacsThread extends Thread
     else
       args = new String[] { "libandroid-emacs.so", "-Q", };
 
+    paramsClosure.run ();
+
     /* Run the native code now.  */
     EmacsNative.initEmacs (args, EmacsApplication.dumpFileName,
 			   Build.VERSION.SDK_INT);
-- 
cgit v1.2.1