Commit cc9b5f72 authored by Thomas Guillem's avatar Thomas Guillem

fix gdb script with ndk11 and last libvlc*so changes

parent 26fc9e14
......@@ -17,7 +17,6 @@ checkfail()
#############
RELEASE=0
GDB_FILE=""
while [ $# -gt 0 ]; do
case $1 in
help|--help)
......@@ -35,10 +34,6 @@ while [ $# -gt 0 ]; do
release|--release)
RELEASE=1
;;
--gdb)
GDB_FILE="$2"
shift
;;
esac
shift
done
......@@ -304,11 +299,6 @@ SRC_DIR=$PWD
NDK_TOOLCHAIN_PATH=`echo ${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin`
CROSS_COMPILE=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-
if [ ! -z "$GDB_FILE" ];then
${CROSS_COMPILE}gdb "$GDB_FILE"
exit 0
fi
export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
###############
......
......@@ -47,11 +47,11 @@ if [ ! -z "$APK_PATH" ]; then
exit 1
fi
arch=$($aapt l -a "$APK_PATH"|grep "libvlcjni.so"|cut -d"/" -f 2)
arch=$($aapt l -a "$APK_PATH"|grep "libvlc.so"|cut -d"/" -f 2)
if [ -z "$DBGFILE_PATH" ];then
version=$($aapt l -a "$APK_PATH"|grep versionName|cut -d\" -f 2)
dbgfile_path="$SCRIPT_PATH/.dbg/$arch/$version/libvlcjni.so.dbg"
dbgfile_path="$SCRIPT_PATH/.dbg/$arch/$version/libvlc.so.dbg"
else
dbgfile_path="$DBGFILE_PATH"
fi
......@@ -64,7 +64,7 @@ if [ ! -z "$APK_PATH" ]; then
echo "\"list *0x<pc_address>\" to know where the specified apk crashed"
echo ""
./compile-libvlc.sh -a $arch --gdb "$dbgfile_path"
${ANDROID_NDK}/prebuilt/linux-x86_64/bin/gdb "$dbgfile_path"
exit 0
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment