Merge branch 'master' into 'master'
Update of org.navitproject.navit This Merge enables the old builds 5650, 5720, 5740 to build with the current Version of F-Droid. A new Version 5827 was also added. See merge request !194
This commit is contained in:
commit
0eb95c01f8
|
@ -26,7 +26,9 @@ Repo:https://svn.code.sf.net/p/navit/code/trunk
|
|||
Build:5650,5650
|
||||
commit=5650
|
||||
update=no
|
||||
build=export PATH=$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
|
||||
prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
|
||||
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=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
|
||||
|
@ -39,7 +41,9 @@ Build:5650,5650
|
|||
Build:5720,5720
|
||||
commit=5720
|
||||
update=no
|
||||
build=export PATH=$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
|
||||
prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
|
||||
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=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
|
||||
|
@ -49,11 +53,12 @@ Build:5720,5720
|
|||
ln -s android-build/navit/android/* .
|
||||
novcheck=yes
|
||||
|
||||
Build:5740,5740
|
||||
disable=fails, android update needed
|
||||
commit=5740
|
||||
Build:5827,5827
|
||||
commit=5827
|
||||
update=no
|
||||
build=export PATH=$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
|
||||
prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
|
||||
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=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
|
||||
|
|
Loading…
Reference in a new issue