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/debug.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'java/debug.sh')

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
 jdb=no
 attach_existing=no
 gdbserver=
+gdb=gdb
 
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -51,6 +52,7 @@ while [ $# -gt 0 ]; do
 	    echo "  --port PORT		run the GDB server on a specific port"
 	    echo "  --jdb-port PORT	run the JDB server on a specific port"
 	    echo "  --jdb		run JDB instead of GDB"
+	    echo "  --gdb		use specified GDB binary"
 	    echo "  --attach-existing	attach to an existing process"
 	    echo "  --gdbserver BINARY	upload and use the specified gdbserver binary"
 	    echo "  --help		print this message"
@@ -65,6 +67,10 @@ while [ $# -gt 0 ]; do
 	"--jdb" )
 	    jdb=yes
 	    ;;
+	"--gdb" )
+	    shift
+	    gdb=$1
+	    ;;
 	"--gdbserver" )
 	    shift
 	    gdbserver=$1
@@ -355,4 +361,4 @@ fi
 
 # Finally, start gdb with any extra arguments needed.
 cd "$oldpwd"
-gdb --eval-command "target remote localhost:$gdb_port" $gdbargs
+$gdb --eval-command "target remote localhost:$gdb_port" $gdbargs
-- 
cgit v1.2.1