From f0b2bbbfe4af01635d9967cd69ba51aaebf8f8a9 Mon Sep 17 00:00:00 2001 From: Michael Dankov Date: Sat, 21 Nov 2015 23:33:27 +0300 Subject: Stick to Android NDK 19 release Because NDK 21 is not compatible with devices running older Android revisions. --- ci/build_android.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/build_android.sh b/ci/build_android.sh index 65118aff4..1e6042ebd 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -136,7 +136,11 @@ 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 -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=21 $SOURCE_PATH +# -DANDROID_NDK_API_VERSION=19 is there because application built with +# Android NDK 21 is not compatible with older devices. +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' \ + -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \ + -DANDROID_API_VERSION=21 -DANDROID_NDK_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 -- cgit v1.2.1