[Android] fix gdb script with ndk11 and last libvlc*so changes

[Thomas Guillem]

vlc-android | branch: 2.0.x | Thomas Guillem <thomas at gllm.fr> | Tue Jun  7 10:26:14 2016 +0200| [d4450656e6233827debfe30896e2bb03a63117bd] | committer: Jean-Baptiste Kempf

fix gdb script with ndk11 and last libvlc*so changes

(cherry picked from commit cc9b5f7275405c44670883ddaa9213eeff5c458c)

> https://code.videolan.org/videolan/vlc-android/commit/d4450656e6233827debfe30896e2bb03a63117bd
---

 compile-libvlc.sh | 10 ----------
 gdb.sh            |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 341d112..58a5e6e 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -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}
 
 ###############
diff --git a/gdb.sh b/gdb.sh
index 7e15d23..b1f71f6 100755
--- a/gdb.sh
+++ b/gdb.sh
@@ -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