Skip to content
Snippets Groups Projects

DO NOT MERGE: test building libvlc.so with outside script

Open DO NOT MERGE: test building libvlc.so with outside script
vlc-libvlc into master
Open Steve Lhomme requested to merge vlc-libvlc into master
Viewing commit ff0675ca
Prev Next
Show latest version
2 files
+ 0
− 52
Compare changes
  • Side-by-side
  • Inline
Files
2
  • ff0675ca
    Steve Lhomme
    buildsystem: remove unused variables · ff0675ca
    Steve Lhomme authored 
    The libvlc and libvlcjni scripts already have their own.

More variables could be removed but they are included by the vlc-android
project so need to be kept for now.
buildsystem/build-libvlcjni.sh
+ 0
− 11
@@ -37,16 +37,12 @@ fi
# Set up ABI variables
if [ "${ANDROID_ABI}" = "x86" ] ; then
TARGET_TUPLE="i686-linux-android"
CLANG_PREFIX=${TARGET_TUPLE}
elif [ "${ANDROID_ABI}" = "x86_64" ] ; then
TARGET_TUPLE="x86_64-linux-android"
CLANG_PREFIX=${TARGET_TUPLE}
elif [ "${ANDROID_ABI}" = "arm64-v8a" ] ; then
TARGET_TUPLE="aarch64-linux-android"
CLANG_PREFIX=${TARGET_TUPLE}
elif [ "${ANDROID_ABI}" = "armeabi-v7a" ] ; then
TARGET_TUPLE="arm-linux-androideabi"
CLANG_PREFIX="armv7a-linux-androideabi"
else
echo "Please pass the ANDROID ABI to the correct architecture, using
compile-libvlc.sh -a ARCH
@@ -88,13 +84,6 @@ fi
VLC_BUILD_DIR="$(cd $VLC_SRC_DIR/; pwd)/build-android-${TARGET_TUPLE}"
if [ -z $VLC_TARBALLS ]; then
VLC_TARBALLS="$(cd $VLC_SRC_DIR/;pwd)/contrib/tarballs"
fi
if [ ! -d $VLC_TARBALLS ]; then
mkdir -p $VLC_TARBALLS
fi
VLC_OUT_PATH="$VLC_BUILD_DIR/ndk"
mkdir -p $VLC_OUT_PATH

VideoLAN code repository instance