Add ANDROID_SDK_ROOT check to release since it is required later, check jarsigner return code, fix zipalign path

1 files changed, 13 insertions, 1 deletions

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 ..