Merge branch 'master' into 'master'

Navit: update meta to R6382

The build is tested, see https://gitlab.com/tryagain/Navit-fdroid/builds/368272

See merge request !1060
This commit is contained in:
Boris Kraut 2015-11-17 18:24:08 +00:00
commit 45e99939fd

View file

@ -590,11 +590,33 @@ Build:6327,6327
cp $$ACRA$$/target/acra-4.3.1.jar libs/ cp $$ACRA$$/target/acra-4.3.1.jar libs/
novcheck=yes novcheck=yes
Build:6382,6382
commit=83b07f8b4d9de9ae8bf693b6e51e5810b58098df
srclibs=ACRA@acra-4.3.1
rm=navit/android/libs/acra-4.3.0b2.jar,navit/support/espeak/espeak-data/*
prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
update=no
build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
rm build.xml && \
mkdir android-build && \
cd android-build/ && \
cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DSAMPLE_MAP=n -DDISABLE_QT=true .. -DANDROID_API_VERSION=19 && \
make && \
make android_resources && \
cd .. && \
rm android-build/navit/android/local.properties android-build/navit/android/CMakeLists.txt && \
ln -s android-build/navit/android/* . && \
pushd $$ACRA$$ && \
$$MVN3$$ package -e -X && \
popd && \
cp $$ACRA$$/target/acra-4.3.1.jar libs/
novcheck=yes
Maintainer Notes: Maintainer Notes:
Found JAR file at navit/android/libs/TTS_library_stub.jar Found JAR file at navit/android/libs/TTS_library_stub.jar
. .
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:None Update Check Mode:None
Current Version:6327 Current Version:6382
Current Version Code:6327 Current Version Code:6382