From fe5bda87ad1a18e7bdb183ded71c68d63d945120 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Wed, 26 Jun 2019 16:16:50 +0300
Subject: [PATCH] added support of not signed android version

---
 .gitignore                        |  2 ++
 Snake/android/AndroidManifest.xml |  2 +-
 installer/installer.pri           | 30 ++++++++++++++++--------------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index b66e854..b60fa14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,4 +78,6 @@ installer/SnakeInstaller
 
 Distro/
 
+android-build/
+
 *.db
diff --git a/Snake/android/AndroidManifest.xml b/Snake/android/AndroidManifest.xml
index 933508a..924b9b4 100644
--- a/Snake/android/AndroidManifest.xml
+++ b/Snake/android/AndroidManifest.xml
@@ -65,7 +65,7 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/>
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/installer/installer.pri b/installer/installer.pri
index b7ab94b..7dcba29 100644
--- a/installer/installer.pri
+++ b/installer/installer.pri
@@ -3,7 +3,7 @@ QML_DIR = $$PWD/../Snake/
 DEPLOY_TARGET = $$PWD/../Snake/build/release
 DEPLOY_SERVER = $$PWD/../SnakeServer/Daemon/build/release,$$PWD/../SnakeServer/Terminal/build/release
 
-ANDROID_BUILD_DIR = $$PWD/android-build
+ANDROID_BUILD_DIR = $$PWD/../android-build
 
 win32:LUPDATE = $$QT_DIR/lupdate.exe
 win32:LRELEASE = $$QT_DIR/lrelease.exe
@@ -108,19 +108,6 @@ deploy_dep.commands += $$DEPLOYER -bin $$DEPLOY_TARGET -qmlDir $$QML_DIR $$BASE_
 
 install_dep.commands = make INSTALL_ROOT=$$ANDROID_BUILD_DIR install
 
-android {
-
-    INPUT_ANDROID = --input $$PWD/../Snake/android-libsnake.so-deployment-settings.json
-    OUTPUT_ANDROID = --output $$ANDROID_BUILD_DIR
-    A_PL = --android-platform android-29
-    JDK = --jdk /usr
-
-    GRADLE = --gradle
-
-    deploy_dep.commands = $$DEPLOYER $$INPUT_ANDROID $$OUTPUT_ANDROID $$A_PL $$JDK $$GRADLE
-    deploy_dep.depends = install_dep
-}
-
 mkpath( $$PWD/../Distro)
 
 win32:CONFIG_FILE = $$PWD/config/configWin.xml
@@ -155,6 +142,21 @@ message( ONLINE_REPO_DIR $$ONLINE_REPO_DIR)
                            $$PWD/../Distro/$$OUT_FILE
 }
 
+android {
+
+    INPUT_ANDROID = --input $$PWD/../Snake/android-libsnake.so-deployment-settings.json
+    OUTPUT_ANDROID = --output $$ANDROID_BUILD_DIR
+    A_PL = --android-platform android-29
+    JDK = --jdk /usr
+
+    GRADLE = --gradle
+
+    deploy_dep.commands = $$DEPLOYER $$INPUT_ANDROID $$OUTPUT_ANDROID $$A_PL $$JDK $$GRADLE
+    deploy_dep.depends = install_dep
+
+    deploy.commands = cp $$ANDROID_BUILD_DIR/build/outputs/apk/* $$PWD/../Distro
+}
+
 OTHER_FILES += \
     $$PWD/config/*.xml \
     $$PWD/config/*.js \