Commit b9998fc3 authored by Thomas Guillem's avatar Thomas Guillem

build: move DBG symbols copy to compile.sh

parent b0505fee
......@@ -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
......
......@@ -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}
......@@ -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
......
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