Merge branch 'vlc' into 'master'

Update VLC

See merge request !386
This commit is contained in:
Boris Kraut 2014-12-07 19:46:21 +00:00
commit 1456d3fe24

View file

@ -360,6 +360,39 @@ Build:0.9.10,10004
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:1.0.0,10002
commit=1.0.0
subdir=vlc-android
srclibs=VLC-2.2@036010e
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:1.0.0,10003
commit=1.0.0
subdir=vlc-android
srclibs=VLC-2.2@036010e
forcevercode=yes
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC-2.2$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi ./compile.sh release
buildjni=no
Build:1.0.0,10004
commit=1.0.0
subdir=vlc-android
srclibs=VLC-2.2@036010e
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