added support of not signed android version

This commit is contained in:
Andrei Yankovich 2019-06-26 16:16:50 +03:00
parent aece0dbe41
commit fe5bda87ad
3 changed files with 19 additions and 15 deletions

2
.gitignore vendored
View File

@ -78,4 +78,6 @@ installer/SnakeInstaller
Distro/
android-build/
*.db

View File

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

View File

@ -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 \