summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorjandegr <jandegr@users.noreply.github.com>2019-08-16 20:45:07 +0200
committerPierre GRANDIN <pgrandin@users.noreply.github.com>2019-08-16 12:45:07 -0600
commitc2f9838f07a52cc64cb05e9cf95bb378261946d9 (patch)
treecc773d9ee43c287c953d2fd90f49f731df020059 /scripts
parentab4d8087a349fa580a4fca1053eca44b1813be16 (diff)
downloadnavit-c2f9838f07a52cc64cb05e9cf95bb378261946d9.tar.gz
Android build fix and update (#827)
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build_android.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/build_android.sh b/scripts/build_android.sh
index 4b915f35e..3f2738451 100755
--- a/scripts/build_android.sh
+++ b/scripts/build_android.sh
@@ -22,8 +22,13 @@ export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin
export JVM_OPTS="-Xmx3200m"
export GRADLE_OPTS='-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+# processing xml is messed up a bit after the original introduction of gradle
+# so a useless install of ant here even if using gradle/ninja
+
+sudo apt-get install -y ant
+
echo Run CMake
-cmake ./ -Dvehicle/gpsd_dbus:BOOL=FALSE -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 -DUSE_PLUGINS=n -DBUILD_MAPTOOL=n -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y -DSAMPLE_MAP=n || exit 1
+cmake ./ -Dvehicle/gpsd_dbus:BOOL=FALSE -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y || exit 1
echo Process icons
pushd navit/icons
@@ -45,6 +50,8 @@ rename 'y/A-Z/a-z/' ./*.mo
popd
popd
+
+
echo Process xml config files
make navit_config_xml || exit 96
pushd navit