diff options
| author | Po Lu | 2023-02-17 16:27:00 +0800 |
|---|---|---|
| committer | Po Lu | 2023-02-17 16:27:00 +0800 |
| commit | 88afd96e36e62017c9c1f2229e2748b6dfbdb39a (patch) | |
| tree | 218845ef248e9ba2131abd22404e3de9dfbf3cbd /java/debug.sh | |
| parent | 759e6a24ab9690541acc6ece1adebaf524d6e5ae (diff) | |
| download | emacs-88afd96e36e62017c9c1f2229e2748b6dfbdb39a.tar.gz emacs-88afd96e36e62017c9c1f2229e2748b6dfbdb39a.zip | |
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.
Diffstat (limited to 'java/debug.sh')
| -rwxr-xr-x | java/debug.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/debug.sh b/java/debug.sh index cbef7518984..30e5a94eee5 100755 --- a/java/debug.sh +++ b/java/debug.sh | |||
| @@ -32,6 +32,7 @@ jdb_port=64013 | |||
| 32 | jdb=no | 32 | jdb=no |
| 33 | attach_existing=no | 33 | attach_existing=no |
| 34 | gdbserver= | 34 | gdbserver= |
| 35 | gdb=gdb | ||
| 35 | 36 | ||
| 36 | while [ $# -gt 0 ]; do | 37 | while [ $# -gt 0 ]; do |
| 37 | case "$1" in | 38 | case "$1" in |
| @@ -51,6 +52,7 @@ while [ $# -gt 0 ]; do | |||
| 51 | echo " --port PORT run the GDB server on a specific port" | 52 | echo " --port PORT run the GDB server on a specific port" |
| 52 | echo " --jdb-port PORT run the JDB server on a specific port" | 53 | echo " --jdb-port PORT run the JDB server on a specific port" |
| 53 | echo " --jdb run JDB instead of GDB" | 54 | echo " --jdb run JDB instead of GDB" |
| 55 | echo " --gdb use specified GDB binary" | ||
| 54 | echo " --attach-existing attach to an existing process" | 56 | echo " --attach-existing attach to an existing process" |
| 55 | echo " --gdbserver BINARY upload and use the specified gdbserver binary" | 57 | echo " --gdbserver BINARY upload and use the specified gdbserver binary" |
| 56 | echo " --help print this message" | 58 | echo " --help print this message" |
| @@ -65,6 +67,10 @@ while [ $# -gt 0 ]; do | |||
| 65 | "--jdb" ) | 67 | "--jdb" ) |
| 66 | jdb=yes | 68 | jdb=yes |
| 67 | ;; | 69 | ;; |
| 70 | "--gdb" ) | ||
| 71 | shift | ||
| 72 | gdb=$1 | ||
| 73 | ;; | ||
| 68 | "--gdbserver" ) | 74 | "--gdbserver" ) |
| 69 | shift | 75 | shift |
| 70 | gdbserver=$1 | 76 | gdbserver=$1 |
| @@ -355,4 +361,4 @@ fi | |||
| 355 | 361 | ||
| 356 | # Finally, start gdb with any extra arguments needed. | 362 | # Finally, start gdb with any extra arguments needed. |
| 357 | cd "$oldpwd" | 363 | cd "$oldpwd" |
| 358 | gdb --eval-command "target remote localhost:$gdb_port" $gdbargs | 364 | $gdb --eval-command "target remote localhost:$gdb_port" $gdbargs |