diff options
Diffstat (limited to 'ci/build_android.sh')
| -rw-r--r-- | ci/build_android.sh | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 98936fa81..18c199bc7 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -130,13 +130,21 @@ mkdir -p $BUILD_PATH cd $BUILD_PATH export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=19 $SOURCE_PATH -make && make apkg || exit 1 -mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk -#mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk -#make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk +# The value comes from ( last_svn_rev - max_build_id ) at the time of the git migration +svn_rev=$(( 5658 + $CIRCLE_BUILD_NUM )) +sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt +mkdir $CIRCLE_ARTIFACTS/android/ +cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/android/ -echo $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=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 +else + make apkg && mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk || exit 1 +fi + +cp ~/android-build/navit/*.xml $CIRCLE_ARTIFACTS/android/ echo echo "Build leftovers :" |