[Android] Move gdb.sh to libvlc/

Geoffrey Métais git at videolan.org
Mon Dec 23 11:34:23 CET 2019


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Dec 20 09:50:09 2019 +0100| [f21d9e8a0650ed235a658148cead75ae0ae263ef] | committer: Geoffrey Métais

Move gdb.sh to libvlc/

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

 gdb.sh => libvlc/gdb.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gdb.sh b/libvlc/gdb.sh
similarity index 58%
rename from gdb.sh
rename to libvlc/gdb.sh
index 3b945416e..32b6b414e 100755
--- a/gdb.sh
+++ b/libvlc/gdb.sh
@@ -2,7 +2,6 @@
 
 SCRIPT_PATH=$(dirname $0)
 TMP_PATH="$SCRIPT_PATH"/.gdb
-
 NDK_GDB_ARGS="--force"
 
 while [ $# -gt 0 ]; do
@@ -17,7 +16,7 @@ done
 rm -rf "$TMP_PATH"
 mkdir -p "$TMP_PATH"
 
-ANDROID_MANIFEST="$SCRIPT_PATH/vlc-android/build/intermediates/merged_manifests/dev/AndroidManifest.xml"
+ANDROID_MANIFEST="$SCRIPT_PATH/../vlc-android/build/intermediates/merged_manifests/dev/AndroidManifest.xml"
 
 if [ ! -f "$ANDROID_MANIFEST" ]; then
     echo "invalid manifest, did you try building first ?"
@@ -26,15 +25,15 @@ fi
 
 mkdir -p "$TMP_PATH"/jni
 
-cp -r "$SCRIPT_PATH"/vlc/build-android-*linux-android*/ndk/libs $TMP_PATH
-cp -r "$SCRIPT_PATH"/vlc/build-android-*linux-android*/ndk/obj $TMP_PATH
+cp -r "$SCRIPT_PATH"/../vlc/build-android-*linux-android*/ndk/libs $TMP_PATH
+cp -r "$SCRIPT_PATH"/../vlc/build-android-*linux-android*/ndk/obj $TMP_PATH
 
-cp -r "$SCRIPT_PATH"/medialibrary/jni/libs "$TMP_PATH"
-cp -r "$SCRIPT_PATH"/medialibrary/jni/obj "$TMP_PATH"
+cp -r "$SCRIPT_PATH"/../medialibrary/jni/libs "$TMP_PATH"
+cp -r "$SCRIPT_PATH"/../medialibrary/jni/obj "$TMP_PATH"
 
 ln -s "$TMP_PATH"/obj "$TMP_PATH"/jni
 
-cp "$SCRIPT_PATH"/libvlc/jni/Android.mk "$TMP_PATH"/jni
+cp "$SCRIPT_PATH"/jni/Android.mk "$TMP_PATH"/jni
 echo "APP_ABI := all" > "$TMP_PATH"/jni/Application.mk
 
 cp "$ANDROID_MANIFEST" "$TMP_PATH"



More information about the Android mailing list