diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-10-27 11:04:45 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-10-27 11:04:45 -0700 |
| commit | 23426cc1146ce872f16abd888444a88fc2dfb23f (patch) | |
| tree | 60fe24052c857434a756de6b99dff3f3e69c156e | |
| parent | 13bc8d08f12bcac4e7e0f4bcd50a376dd5997d02 (diff) | |
| download | navit-23426cc1146ce872f16abd888444a88fc2dfb23f.tar.gz | |
Revert "Fix:android:Ensures that we capture all build errors"
This reverts commit 13bc8d08f12bcac4e7e0f4bcd50a376dd5997d02.
| -rw-r--r-- | ci/build_android.sh | 4 | ||||
| -rw-r--r-- | ci/build_android_x86.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index f03d4bbe8..e94e156b5 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -30,8 +30,8 @@ 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 || exit -1 -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 +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 cc51cfeee..69a761b26 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -30,8 +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) -make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit -1 -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 +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 :" |