diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2015-10-25 10:21:07 +0100 |
|---|---|---|
| committer | jandegr <jandegr@users.noreply.github.com> | 2015-10-25 10:21:07 +0100 |
| commit | d567fbdd61af437ed2deedd958e9fdb644b9338a (patch) | |
| tree | fe18e8a6472146859b9231177b9c31df680f7d73 /ci/build_android.sh | |
| parent | 022b37cb504ea893f4fd7c91e59ab66d00612a88 (diff) | |
| download | navit-d567fbdd61af437ed2deedd958e9fdb644b9338a.tar.gz | |
Update build_android.sh
don't build maptool in the android build,
it breaks anyway if you target API 21 or higher
because of a change in the NDK
Diffstat (limited to 'ci/build_android.sh')
| -rw-r--r-- | ci/build_android.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 18c199bc7..e9302535c 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -136,7 +136,7 @@ sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/n mkdir $CIRCLE_ARTIFACTS/android/ cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/android/ -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DANDROID_API_VERSION=19 $SOURCE_PATH +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 $SOURCE_PATH make || exit 1 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk || exit 1 |