diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-10-27 11:04:57 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-10-27 11:04:57 -0700 |
| commit | 01788f4fef79db0c26fd8a45caeb69c81b99d691 (patch) | |
| tree | e5f71f0ae6940dcd0b769fcfb6384d868809f325 | |
| parent | 23426cc1146ce872f16abd888444a88fc2dfb23f (diff) | |
| download | navit-01788f4fef79db0c26fd8a45caeb69c81b99d691.tar.gz | |
Revert "Always build 'release' package for android"
This reverts commit 31c9535d5066f9d611f34fc09acd804c48650062.
| -rw-r--r-- | ci/build_android.sh | 7 | ||||
| -rw-r--r-- | ci/build_android_x86.sh | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index e94e156b5..ad42c78c2 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -30,8 +30,11 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024* make -j $(nproc --all) -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 +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 echo echo "Build leftovers :" diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 69a761b26..6e84bc4e1 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -30,8 +30,11 @@ 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) -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 +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 echo echo "Build leftovers :" |