diff options
| author | Po Lu | 2023-01-25 18:44:47 +0800 |
|---|---|---|
| committer | Po Lu | 2023-01-25 18:44:47 +0800 |
| commit | 0900bfbcc57c555909cb75c38eb0ed26fb6964ef (patch) | |
| tree | 9a2fa4328defab79f1cb3dcfac4f3c071bf0a633 /src/android.h | |
| parent | 6f9a2a8f29c7faf13d0d86001b140746efc455b5 (diff) | |
| download | emacs-0900bfbcc57c555909cb75c38eb0ed26fb6964ef.tar.gz emacs-0900bfbcc57c555909cb75c38eb0ed26fb6964ef.zip | |
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.
Diffstat (limited to 'src/android.h')
| -rw-r--r-- | src/android.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/android.h b/src/android.h index ce0ccfc4338..6c20995e4a1 100644 --- a/src/android.h +++ b/src/android.h | |||
| @@ -38,15 +38,11 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 38 | #include "lisp.h" | 38 | #include "lisp.h" |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | /* This must be used in every symbol declaration to export it to the | 41 | extern bool android_init_gui; |
| 42 | JNI Emacs wrapper. */ | ||
| 43 | #define ANDROID_EXPORT __attribute__ ((visibility ("default"))) | ||
| 44 | |||
| 45 | extern bool ANDROID_EXPORT android_init_gui; | ||
| 46 | extern int ANDROID_EXPORT android_emacs_init (int, char **); | ||
| 47 | 42 | ||
| 48 | #ifndef ANDROID_STUBIFY | 43 | #ifndef ANDROID_STUBIFY |
| 49 | 44 | ||
| 45 | extern int android_emacs_init (int, char **, char *); | ||
| 50 | extern int android_select (int, fd_set *, fd_set *, fd_set *, | 46 | extern int android_select (int, fd_set *, fd_set *, fd_set *, |
| 51 | struct timespec *); | 47 | struct timespec *); |
| 52 | 48 | ||