Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-02 10:35:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Android debugging script and README

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2020-08-13 20:27:03 +02:00
parent 0df86aa416
commit 82ba488574
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_scripts/Android/README.asciidoc
View File

@ -247,7 +247,7 @@ ${RS_SOURCE_DIR}/build_scripts/Android/pull_sysroot.sh
[source,bash] [source,bash]
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
## Optionally set Qt version variable consistently with your installation ## Optionally set Qt version variable consistently with your installation
export QT_VERSION="5.12.4" export QT_VERSION="5.12.7"
## Optionally set Qt architecture variable consistently with Android device ## Optionally set Qt architecture variable consistently with Android device
export QT_ARCH="arm64_v8a" export QT_ARCH="arm64_v8a"

37
build_scripts/Android/start_gdbserver.sh
View File

@ -41,41 +41,56 @@ function define_default_value()
define_default_value ANDROID_APK_PACKAGE "org.retroshare.service" define_default_value ANDROID_APK_PACKAGE "org.retroshare.service"
define_default_value ANDROID_PROCESS_NAME "org.retroshare.service:rs" define_default_value ANDROID_PROCESS_NAME "org.retroshare.service:rs"
define_default_value ANDROID_INSTALL_PATH ""
define_default_value LIB_GDB_SERVER_PATH ""
define_default_value ANDROID_SERIAL "$(adb devices | head -n 2 | tail -n 1 | awk '{print $1}')" define_default_value ANDROID_SERIAL "$(adb devices | head -n 2 | tail -n 1 | awk '{print $1}')"
define_default_value GDB_SERVER_PORT 5039 define_default_value GDB_SERVER_PORT 5039
adb_shell() adb_ushell()
{ {
adb shell run-as ${ANDROID_APK_PACKAGE} $@ adb shell run-as ${ANDROID_APK_PACKAGE} $@
} }
[ -z "${ANDROID_INSTALL_PATH}" ] &&
{
ANDROID_INSTALL_PATH="$(adb_ushell pm path "${ANDROID_APK_PACKAGE}")"
ANDROID_INSTALL_PATH="$(dirname ${ANDROID_INSTALL_PATH#"package:"})"
[ -z "${ANDROID_INSTALL_PATH}" ] &&
cat <<EOF
Cannot find install path for ${ANDROID_APK_PACKAGE} make sure it is installed,
or manually specify ANDROID_INSTALL_PATH
EOF
}
## If not passed as environement variable try to determine gdbserver path ## If not passed as environement variable try to determine gdbserver path
## shipped withing Android package ## shipped withing APK
[ -z "${LIB_GDB_SERVER_PATH}" ] && [ -z "${LIB_GDB_SERVER_PATH}" ] &&
{ {
for mUsualPath in \ for mUsualPath in \
"/data/data/${ANDROID_APK_PACKAGE}/lib/libgdbserver.so" \ "${ANDROID_INSTALL_PATH}/lib/libgdbserver.so" \
"/data/app/${ANDROID_APK_PACKAGE}"*"/lib/arm64/libgdbserver.so" "${ANDROID_INSTALL_PATH}/lib/arm64/libgdbserver.so"
do do
adb_shell ls "${mUsualPath}" && adb_ushell ls "${mUsualPath}" &&
export LIB_GDB_SERVER_PATH="${mUsualPath}" && break export LIB_GDB_SERVER_PATH="${mUsualPath}" && break
done done
} }
[ -z "${LIB_GDB_SERVER_PATH}" ] && [ -z "${LIB_GDB_SERVER_PATH}" ] &&
{ {
cat <<EOF cat <<EOF
libgdbserver.so not found in any of the usual path attempting to look for it libgdbserver.so not found in any of the usual path attempting to look for it
with find, it will take a bunch of time. Take note of the discovered path and with find, it will take a little more time. Take note of the discovered path and
define LIB_GDB_SERVER_PATH on your commandline at next run to avoid waiting define LIB_GDB_SERVER_PATH on your commandline at next run to avoid waiting
again. again.
EOF EOF
tFile="$(mktemp)" tFile="$(mktemp)"
adb_shell find -type f -name 'libgdbserver.so' / | \ adb_ushell find ${ANDROID_INSTALL_PATH} -type f -name 'libgdbserver.so' | \
grep ${ANDROID_APK_PACKAGE} | tee "${tFile}" tee "${tFile}"
LIB_GDB_SERVER_PATH="$(head -n 1 "${tFile}")" LIB_GDB_SERVER_PATH="$(head -n 1 "${tFile}")"
rm "${tFile}" rm "${tFile}"
@ -87,7 +102,7 @@ EOF
exit -1 exit -1
} }
mPid="$(adb_shell ps | grep ${ANDROID_PROCESS_NAME} | awk '{print $2}')" mPid="$(adb_ushell ps | grep ${ANDROID_PROCESS_NAME} | awk '{print $2}')"
[ -z "${mPid}" ] && [ -z "${mPid}" ] &&
{ {
echo "Failed ${ANDROID_PROCESS_NAME} PID retrival are you sure it is running?" echo "Failed ${ANDROID_PROCESS_NAME} PID retrival are you sure it is running?"
@ -98,4 +113,4 @@ mPid="$(adb_shell ps | grep ${ANDROID_PROCESS_NAME} | awk '{print $2}')"
## Establish port forwarding so we can connect to gdbserver with gdb ## Establish port forwarding so we can connect to gdbserver with gdb
adb forward tcp:${GDB_SERVER_PORT} tcp:${GDB_SERVER_PORT} adb forward tcp:${GDB_SERVER_PORT} tcp:${GDB_SERVER_PORT}
((adb_shell ${LIB_GDB_SERVER_PATH} 127.0.0.1:${GDB_SERVER_PORT} --attach ${mPid})&) ((adb_ushell ${LIB_GDB_SERVER_PATH} 127.0.0.1:${GDB_SERVER_PORT} --attach ${mPid})&)