From 5ccc83b133fb4501b0840c217c2a92d7cbc7c671 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <intser79@gmail.com>
Date: Sun, 11 Oct 2020 18:29:37 +0500
Subject: Add ANDROID_SDK_ROOT check to release since it is required later,
 check jarsigner return code, fix zipalign path

---
 build_android.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/build_android.sh b/build_android.sh
index 9251cc2b..1ba54827 100755
--- a/build_android.sh
+++ b/build_android.sh
@@ -24,6 +24,12 @@ build_release() {
                 exit
         fi
 
+	if [[ -z "${ANDROID_SDK_ROOT}" ]]; then
+	    echo "ANDROID_SDK_ROOT must be set for release build"
+	    exit 1
+	fi
+
+
        BUILD_MODE="native"
         rm -rf release_files 2>/dev/null
         mkdir release_files
@@ -58,7 +64,13 @@ build_release() {
 
             cd release_files/
             jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../platforms/android/zmNinja.keystore android-release-unsigned.apk zmNinja
-            ~/Library/Android/sdk/build-tools/${SDK_VERSION}/zipalign -v 4 android-release-unsigned.apk zmNinja.apk
+	    ret=$?
+	    if [ $ret -ne 0 ]; then
+                echo "Unable to sign jar, please fix the error above"
+		exit 1
+	    fi
+
+            $ANDROID_SDK_ROOT/build-tools/${SDK_VERSION}/zipalign -v 4 android-release-unsigned.apk zmNinja.apk
             rm -f android-release-unsigned.apk 
             cd ..
 
-- 
cgit v1.2.3


From 4d85b137a2206c939959bb7c552f474d5d0adc12 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <intser79@gmail.com>
Date: Sun, 11 Oct 2020 18:34:35 +0500
Subject: Remove tabs

---
 build_android.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build_android.sh b/build_android.sh
index 1ba54827..c06b1d45 100755
--- a/build_android.sh
+++ b/build_android.sh
@@ -24,10 +24,10 @@ build_release() {
                 exit
         fi
 
-	if [[ -z "${ANDROID_SDK_ROOT}" ]]; then
-	    echo "ANDROID_SDK_ROOT must be set for release build"
-	    exit 1
-	fi
+        if [[ -z "${ANDROID_SDK_ROOT}" ]]; then
+            echo "ANDROID_SDK_ROOT must be set for release build"
+            exit 1
+        fi
 
 
        BUILD_MODE="native"
@@ -65,10 +65,10 @@ build_release() {
             cd release_files/
             jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../platforms/android/zmNinja.keystore android-release-unsigned.apk zmNinja
 	    ret=$?
-	    if [ $ret -ne 0 ]; then
+            if [ $ret -ne 0 ]; then
                 echo "Unable to sign jar, please fix the error above"
-		exit 1
-	    fi
+                exit 1
+            fi
 
             $ANDROID_SDK_ROOT/build-tools/${SDK_VERSION}/zipalign -v 4 android-release-unsigned.apk zmNinja.apk
             rm -f android-release-unsigned.apk 
-- 
cgit v1.2.3