aboutsummaryrefslogtreecommitdiffstats
path: root/java/org/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'java/org/gnu')
-rw-r--r--java/org/gnu/emacs/EmacsNative.java7
-rw-r--r--java/org/gnu/emacs/EmacsNoninteractive.java3
-rw-r--r--java/org/gnu/emacs/EmacsThread.java5
3 files changed, 11 insertions, 4 deletions
diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index a772b965301..7bf8b5f6081 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -65,8 +65,11 @@ public class EmacsNative
65 undefined. 65 undefined.
66 66
67 DUMPFILE is the dump file to use, or NULL if Emacs is to load 67 DUMPFILE is the dump file to use, or NULL if Emacs is to load
68 loadup.el itself. */ 68 loadup.el itself.
69 public static native void initEmacs (String argv[], String dumpFile); 69
70 APILEVEL is the version of Android being used. */
71 public static native void initEmacs (String argv[], String dumpFile,
72 int apiLevel);
70 73
71 /* Abort and generate a native core dump. */ 74 /* Abort and generate a native core dump. */
72 public static native void emacsAbort (); 75 public static native void emacsAbort ();
diff --git a/java/org/gnu/emacs/EmacsNoninteractive.java b/java/org/gnu/emacs/EmacsNoninteractive.java
index b4854d8323f..4da82f2f894 100644
--- a/java/org/gnu/emacs/EmacsNoninteractive.java
+++ b/java/org/gnu/emacs/EmacsNoninteractive.java
@@ -177,6 +177,7 @@ public class EmacsNoninteractive
177 EmacsApplication.findDumpFile (context); 177 EmacsApplication.findDumpFile (context);
178 178
179 /* Start Emacs. */ 179 /* Start Emacs. */
180 EmacsNative.initEmacs (args, EmacsApplication.dumpFileName); 180 EmacsNative.initEmacs (args, EmacsApplication.dumpFileName,
181 Build.VERSION.SDK_INT);
181 } 182 }
182}; 183};
diff --git a/java/org/gnu/emacs/EmacsThread.java b/java/org/gnu/emacs/EmacsThread.java
index f5e9d54044a..2724d838d41 100644
--- a/java/org/gnu/emacs/EmacsThread.java
+++ b/java/org/gnu/emacs/EmacsThread.java
@@ -21,6 +21,8 @@ package org.gnu.emacs;
21 21
22import java.lang.Thread; 22import java.lang.Thread;
23 23
24import android.os.Build;
25
24public class EmacsThread extends Thread 26public class EmacsThread extends Thread
25{ 27{
26 /* Whether or not Emacs should be started -Q. */ 28 /* Whether or not Emacs should be started -Q. */
@@ -45,6 +47,7 @@ public class EmacsThread extends Thread
45 args = new String[] { "libandroid-emacs.so", "-Q", }; 47 args = new String[] { "libandroid-emacs.so", "-Q", };
46 48
47 /* Run the native code now. */ 49 /* Run the native code now. */
48 EmacsNative.initEmacs (args, EmacsApplication.dumpFileName); 50 EmacsNative.initEmacs (args, EmacsApplication.dumpFileName,
51 Build.VERSION.SDK_INT);
49 } 52 }
50}; 53};