[Android] build: move DBG symbols copy to compile.sh

[Thomas Guillem]

vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon May 13 16:13:36 2019 +0200| [b9998fc3fe75a4f65160e53747b38cdf532fe25c] | committer: Thomas Guillem

build: move DBG symbols copy to compile.sh

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

 compile-libvlc.sh       | 7 -------
 compile-medialibrary.sh | 8 --------
 compile.sh              | 8 ++++++++
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index b2eac72e5..dcdbc881c 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -669,13 +669,6 @@ $ANDROID_NDK/ndk-build$OSCMD -C libvlc \
     NDK_DEBUG=${NDK_DEBUG}
 
 avlc_checkfail "ndk-build libvlc failed"
-
-cd ${SRC_DIR}
-OUT_DBG_DIR=.dbg/${ANDROID_ABI}
-echo "Dumping dbg symbols info ${OUT_DBG_DIR}"
-
-mkdir -p $OUT_DBG_DIR
-cp -a libvlc/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
 } # avlc_build()
 
 if [ "$AVLC_SOURCED" != "1" ]; then
diff --git a/compile-medialibrary.sh b/compile-medialibrary.sh
index ec07c8bb9..d8b31346d 100755
--- a/compile-medialibrary.sh
+++ b/compile-medialibrary.sh
@@ -181,11 +181,3 @@ $ANDROID_NDK/ndk-build$OSCMD -C medialibrary \
     NDK_DEBUG=${NDK_DEBUG}
 
 avlc_checkfail "nkd-build medialibrary failed"
-
-echo "Dumping dbg symbols info ${OUT_DBG_DIR}"
-
-cd ${SRC_DIR}
-OUT_DBG_DIR=.dbg/${ANDROID_ABI}
-
-mkdir -p $OUT_DBG_DIR
-cp -a medialibrary/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
diff --git a/compile.sh b/compile.sh
index f9d2f9972..1a0c0ca82 100755
--- a/compile.sh
+++ b/compile.sh
@@ -270,14 +270,22 @@ compile() {
         OPTS="$OPTS release"
     fi
 
+    OUT_DBG_DIR=.dbg/${ANDROID_ABI}
+    mkdir -p $OUT_DBG_DIR
+
     # Build LibVLC if asked for it, or needed by medialibrary
     if [ "$BUILD_MEDIALIB" != 1 -o ! -d "libvlc/jni/libs/$1" ]; then
         AVLC_SOURCED=1 . ./compile-libvlc.sh
         avlc_build
+
+        cp -a $VLC_OUT_PATH/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
+        cp -a ./libvlc/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
     fi
 
     if [ "$NO_ML" != 1 ]; then
         ./compile-medialibrary.sh $OPTS
+
+        cp -a medialibrary/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
     fi
 }
 if [ "$ANDROID_ABI" = "all" ]; then