From 13bc8d08f12bcac4e7e0f4bcd50a376dd5997d02 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@gmail.com>
Date: Fri, 27 Oct 2017 10:58:33 -0700
Subject: [PATCH] Fix:android:Ensures that we capture all build errors

---
 ci/build_android.sh     | 4 ++--
 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 e94e156b51..f03d4bbe80 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
-make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk
+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
 
 echo
 echo "Build leftovers :"
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh
index 69a761b265..cc51cfeeeb 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
-make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk
+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
 
 echo
 echo "Build leftovers :"