From eeb7c8f5de75e51aa9abaacf3fb2ff2e17995f8c Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 5 Mar 2017 22:02:50 +0100
Subject: [PATCH] Added a support for release builds

---
 android/AndroidManifest.xml |  3 +--
 android/README.ANDROID      |  4 ++++
 android/make.sh             | 24 +++++++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 1a6a1f61d..308a89c4a 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -5,8 +5,7 @@
           android:versionName="1.0">
 
     <!-- This .apk has no Java code itself, so set hasCode to false. -->
-    <application android:debuggable="true"
-                 android:label="@string/app_name"
+    <application android:label="@string/app_name"
                  android:icon="@drawable/icon"
                  android:hasCode="false"
                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
diff --git a/android/README.ANDROID b/android/README.ANDROID
index 6e136b14f..38c9847e2 100644
--- a/android/README.ANDROID
+++ b/android/README.ANDROID
@@ -70,6 +70,10 @@ If you want to prepare a package for particular architecture, you can choose it
 by setting the COMPILE_ARCH environmental variable. At this stage, supported
 architectures are "armv7", "x86" and "aarch64". The default is "armv7".
 
+You can choose build type by setting BUILD_TYPE environment variable to "debug"
+or "release". The default is debug build. Note that if you choose release build,
+you have to manually sign the apk with your key and run zipalign.
+
 Basically if all dependencies are installed in the system, it should be enough
 to just run:
 
diff --git a/android/make.sh b/android/make.sh
index ee7971e0e..331073a75 100755
--- a/android/make.sh
+++ b/android/make.sh
@@ -65,11 +65,11 @@ if [ -f "$DIRNAME/obj/compile_arch" ]; then
     fi
 fi
 
+# Update variables for selected architecture
 if [ -z "$COMPILE_ARCH" ]; then
     COMPILE_ARCH="armv7"
 fi
 
-# Update variables for selected architecture
 if [ "$COMPILE_ARCH" = "armv7" ]; then
     export NDK_PLATFORM=$NDK_PLATFORM_ARMV7
     export NDK_ABI=$NDK_ABI_ARMV7
@@ -91,6 +91,23 @@ else
     exit
 fi
 
+# Update variables for selected build type
+if [ -z "$BUILD_TYPE" ]; then
+    BUILD_TYPE="debug"
+fi
+
+if [ "$BUILD_TYPE" = "debug" ] || [ "$BUILD_TYPE" = "Debug" ]; then
+    export BUILD_TYPE="debug"
+    export IS_DEBUG_BUILD=1
+elif [ "$BUILD_TYPE" = "release" ] || [ "$BUILD_TYPE" = "Release" ]; then
+    export BUILD_TYPE="release"
+    export IS_DEBUG_BUILD=0
+else
+    echo "Unsupported BUILD_TYPE: $BUILD_TYPE. Possible values are: " \
+         "debug, release"
+    exit
+fi
+
 # Check if we have access to the Android NDK and SDK
 if [ -z "$NDK_PATH" ]; then
     export NDK_PATH="$NDK_PATH_DEFAULT"
@@ -278,11 +295,12 @@ ${NDK_PATH}/ndk-build $@                 \
     APP_ABI="$NDK_ABI"                   \
     APP_PLATFORM="$NDK_PLATFORM"         \
     APP_CPPFLAGS="$NDK_CPPFLAGS"         \
-    APP_STL=gnustl_static
+    APP_STL=gnustl_static                \
+    NDK_DEBUG=$IS_DEBUG_BUILD
 
 check_error
 
 # Build apk
 echo "Building APK"
-ant debug -Dsdk.dir="$SDK_PATH" -Dtarget=$NDK_PLATFORM
+ant $BUILD_TYPE -Dsdk.dir="$SDK_PATH" -Dtarget=$NDK_PLATFORM
 check_error