mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated OpenSSL and android dependencies

Browse Source
This commit is contained in:
akallabeth 2021-03-15 09:49:23 +01:00 committed by akallabeth
parent bb6c1ed8a4
commit 23aa5fb873
7 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/Android/Studio/aFreeRDP/build.gradle
View File

@ -1,13 +1,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion = 28 compileSdkVersion = rootProject.ext.compileApi
buildToolsVersion = "28.0.3" buildToolsVersion = rootProject.ext.toolsVersion
defaultConfig { defaultConfig {
applicationId "com.freerdp.afreerdp" applicationId "com.freerdp.afreerdp"
minSdkVersion 21 minSdkVersion rootProject.ext.minApi
targetSdkVersion 28 targetSdkVersion rootProject.ext.targetApi
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
versionCode = rootProject.ext.versionCode versionCode = rootProject.ext.versionCode
versionName = rootProject.ext.versionName versionName = rootProject.ext.versionName

14
client/Android/Studio/build.gradle
View File

@ -30,12 +30,20 @@ def getVersionName = { ->
ext { ext {
versionName = properties.get('VERSION_NAME', getVersionName()) versionName = properties.get('VERSION_NAME', getVersionName())
versionCode = properties.get('VERSION_CODE', 100) versionCode = properties.get('VERSION_CODE', 100)
compileApi = properties.get('COMPILE_API', 30)
targetApi = properties.get('TARGET_API', 30)
minApi = properties.get('MIN_API', 21)
toolsVersion = properties.get('TOOLS_VERSION', '30.0.3')
println '----------------- Project configuration -------------------' println '----------------- Project configuration -------------------'
println 'VERSION_NAME: ' + versionName println 'VERSION_NAME: ' + versionName
println 'VERSION_CODE: ' + versionCode println 'VERSION_CODE: ' + versionCode
println 'RELEASE_STORE_FILE: '+ RELEASE_STORE_FILE println 'RELEASE_STORE_FILE: ' + RELEASE_STORE_FILE
println 'RELEASE_KEY_ALIAS: '+ RELEASE_KEY_ALIAS println 'RELEASE_KEY_ALIAS: ' + RELEASE_KEY_ALIAS
println 'compile API: ' + compileApi
println 'target API: ' + targetApi
println 'min API: ' + minApi
println 'tools version: ' + toolsVersion
println '-----------------------------------------------------------' println '-----------------------------------------------------------'
} }
@ -45,7 +53,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:4.1.2'
} }
} }

8
client/Android/Studio/freeRDPCore/build.gradle
View File

@ -1,12 +1,12 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion = 28 compileSdkVersion = rootProject.ext.compileApi
buildToolsVersion = "28.0.3" buildToolsVersion = rootProject.ext.toolsVersion
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion rootProject.ext.minApi
targetSdkVersion 28 targetSdkVersion rootProject.ext.targetApi
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
versionCode = rootProject.ext.versionCode versionCode = rootProject.ext.versionCode
versionName = rootProject.ext.versionName versionName = rootProject.ext.versionName

4
client/Android/Studio/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Jan 17 10:58:32 UTC 2018 #Mon Mar 15 09:39:30 CET 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

2
scripts/android-build-32.conf
View File

@ -18,7 +18,7 @@ NDK_TARGET=21
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
OPENSSL_TAG=OpenSSL_1_1_1h OPENSSL_TAG=OpenSSL_1_1_1j
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

2
scripts/android-build-64.conf
View File

@ -18,7 +18,7 @@ NDK_TARGET=21
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
OPENSSL_TAG=OpenSSL_1_1_1h OPENSSL_TAG=OpenSSL_1_1_1j
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

2
scripts/android-build.conf
View File

@ -18,7 +18,7 @@ NDK_TARGET=26
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
OPENSSL_TAG=OpenSSL_1_1_1h OPENSSL_TAG=OpenSSL_1_1_1j
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs