diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index 3eb27589dd..153455ddec 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -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 '' > 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 '' > 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 && \
@@ -50,10 +54,26 @@ Build:5720,5720
novcheck=yes
Build:5740,5740
- disable=fails, android update needed
commit=5740
update=no
- build=export PATH=$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+ prebuild=echo '' > 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 && \
+ make && \
+ make android_resources && \
+ cd .. && \
+ ln -s android-build/navit/android/* .
+ novcheck=yes
+
+Build:5827,5827
+ commit=5827
+ update=no
+ prebuild=echo '' > 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 && \