Merge branch 'vlc' into 'master'

Update VLC

See merge request !198
This commit is contained in:
Boris Kraut 2014-08-03 21:46:36 +00:00
commit 1b194ac959

View file

@ -261,6 +261,28 @@ Build:0.9.7.1,9714
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:0.9.8,9802
commit=0.9.8
subdir=vlc-android
srclibs=VLC-2.2@f2db364
forcevercode=yes
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC-2.2$$ ../vlc
build=cd ../ && \
ANDROID_ABI=x86 ./compile.sh release
buildjni=no
Build:0.9.8,9804
commit=0.9.8
subdir=vlc-android
srclibs=VLC-2.2@f2db364
forcevercode=yes
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC-2.2$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Maintainer Notes:
Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
see http://buildbot.videolan.org/builders/ for version code scheme