Merge commit 'refs/merge-requests/331' of https://gitorious.org/f-droid/fdroiddata into merge-requests/331

This commit is contained in:
Ciaran Gultnieks 2014-02-02 11:17:59 +00:00
commit e8bed53350
2 changed files with 19 additions and 1 deletions

View file

@ -33,6 +33,11 @@ Build:1.02,102
target=android-19 target=android-19
prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties
Build:1.03,103
commit=799b7d
subdir=master/android/OWMapAtAndroid
prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:RepoManifest Update Check Mode:RepoManifest
Current Version:1.03 Current Version:1.03

View file

@ -90,7 +90,20 @@ Build:0.6.6,90
build=./scripts/build-ffmpeg.sh build=./scripts/build-ffmpeg.sh
buildjni=yes buildjni=yes
Auto Update Mode:None Build:0.6.7,97
commit=v0.6.7
srclibs=1:appcompat@ad5a63f;Jericho@3.3
prebuild=cp $$appcompat$$/libs/android-support-v4.jar libs/ && \
cp $$appcompat$$/libs/android-support-v7-appcompat.jar libs/ && \
cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \
cp $$Jericho$$/compile-time-dependencies/* libs/ && \
sed -i 's/make -j4/make -j2/g' scripts/* && \
rm custom_rules.xml && \
chmod +x scripts/build-ffmpeg.sh
build=./scripts/build-ffmpeg.sh
buildjni=yes
Auto Update Mode:Version v%v
Update Check Mode:Tags Update Check Mode:Tags
Current Version:0.6.7 Current Version:0.6.7
Current Version Code:97 Current Version Code:97