From 53be1d35096b1a5bc016bfbe59eb0f7297d885a1 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 24 May 2018 11:17:17 +0100 Subject: [PATCH] If Android build is skipped due to an error, print it to the terminal --- util/buildscripts/scripts/compile_win32.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/buildscripts/scripts/compile_win32.sh b/util/buildscripts/scripts/compile_win32.sh index f6727494e..baf003d6b 100755 --- a/util/buildscripts/scripts/compile_win32.sh +++ b/util/buildscripts/scripts/compile_win32.sh @@ -47,14 +47,16 @@ export PATH=$PATH:$(cygpath -u $ANDROID_SDK/tools/) # Check that we're set up to build for android if [ ! -d $ANDROID_SDK/tools ] ; then - echo "\$ANDROID_SDK is not correctly configured: '$ANDROID_SDK'" >> /tmp/android.log + echo "\$ANDROID_SDK is not correctly configured: '$ANDROID_SDK'" > /tmp/android.log + cat /tmp/android.log $ERROR_SCRIPT /tmp/android.log # Don't return an error code, consider android errors non-fatal other than emailing exit 0; fi if [ ! -d $LLVM_ARM32 ] || [ ! -d $LLVM_ARM64 ] ; then - echo "llvm is not available, expected $LLVM_ARM32 and $LLVM_ARM64 respectively." >> /tmp/android.log + echo "llvm is not available, expected $LLVM_ARM32 and $LLVM_ARM64 respectively." > /tmp/android.log + cat /tmp/android.log $ERROR_SCRIPT /tmp/android.log # Don't return an error code, consider android errors non-fatal other than emailing exit 0;