Merge branch 'master' into 'master'
Update Navit metadata to build R6327 The build is tested, see https://gitlab.com/tryagain/Navit-fdroid/builds/338452 See merge request !1041
This commit is contained in:
commit
1fb66d1706
|
@ -568,11 +568,33 @@ Build:6255,6255
|
||||||
cp $$ACRA$$/target/acra-4.3.1.jar libs/
|
cp $$ACRA$$/target/acra-4.3.1.jar libs/
|
||||||
novcheck=yes
|
novcheck=yes
|
||||||
|
|
||||||
|
Build:6327,6327
|
||||||
|
commit=3ce0f5b4410d98c2f08e7288dcb1c209e3cecdf9
|
||||||
|
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:6255
|
Current Version:6327
|
||||||
Current Version Code:6255
|
Current Version Code:6327
|
||||||
|
|
Loading…
Reference in a new issue