diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-10-27 10:45:15 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-10-27 10:45:15 -0700 |
| commit | 31c9535d5066f9d611f34fc09acd804c48650062 (patch) | |
| tree | 60fe24052c857434a756de6b99dff3f3e69c156e | |
| parent | b49080ec5fcfad8e33e14345fcaf8ed18e4ff8a2 (diff) | |
| download | navit-31c9535d5066f9d611f34fc09acd804c48650062.tar.gz | |
Always build 'release' package for android
| -rw-r--r-- | ci/build_android.sh | 7 | ||||
| -rw-r--r-- | ci/build_android_x86.sh | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index ad42c78c2..e94e156b5 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -30,11 +30,8 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024* make -j $(nproc --all) -if [[ "${CIRCLE_BRANCH}" == "master" ]]; then - make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 -else - make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 -fi +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk echo echo "Build leftovers :" diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 6e84bc4e1..69a761b26 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -30,11 +30,8 @@ android list targets cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 .. make -j $(nproc --all) -if [[ "${CIRCLE_BRANCH}" == "master" ]]; then - make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 -else - make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 -fi +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk echo echo "Build leftovers :" |