morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[client,android] update

Browse Source 
* update dependenciy versions in build script
* update gradle dependencies
This commit is contained in:
akallabeth
2025-05-05 13:33:30 +02:00
parent 9cd82fcab6
commit 914473e87b
10 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:8.8.0'
classpath 'com.android.tools.build:gradle:8.9.2'
}
}

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

@@ -14,7 +14,7 @@ android {
minSdkVersion rootProject.ext.minApi
targetSdkVersion rootProject.ext.targetApi
vectorDrawables.useSupportLibrary = true
ndkVersion = "27.2.12479018"
ndkVersion = "29.0.13113456"
ndk {
File jniLibsDirectory = new File(project.projectDir, "src/main/jniLibs")
@@ -28,6 +28,7 @@ android {
if (new File(jniLibsDirectory, "x86/libfreerdp3.so").exists())
abiFiltersList.add("x86")
//noinspection ChromeOsAbiSupport
abiFilters = abiFiltersList
}

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

@@ -1,6 +1,6 @@
#Mon Jan 20 07:44:59 CET 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

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

@@ -18,12 +18,12 @@ DEPS_ONLY=0
NDK_TARGET=21
WITH_MEDIACODEC=0
OPENH264_TAG=v2.5.0
OPENH264_HASH=94c8ca364db990047ec4ec3481b04ce0d791e62561ef5601443011bdc00825e3
OPENSSL_TAG=openssl-3.4.0
OPENSSL_HASH=e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
FFMPEG_TAG=n7.1
FFMPEG_HASH=7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a
OPENH264_TAG=v2.6.0
OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
OPENSSL_TAG=openssl-3.5.0
OPENSSL_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
FFMPEG_TAG=n7.1.1
FFMPEG_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
CJSON_TAG=v1.7.18
CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5

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

@@ -18,12 +18,12 @@ DEPS_ONLY=0
NDK_TARGET=21
WITH_MEDIACODEC=0
OPENH264_TAG=v2.5.0
OPENH264_HASH=94c8ca364db990047ec4ec3481b04ce0d791e62561ef5601443011bdc00825e3
OPENSSL_TAG=openssl-3.4.0
OPENSSL_HASH=e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
FFMPEG_TAG=n7.1
FFMPEG_HASH=7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a
OPENH264_TAG=v2.6.0
OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
OPENSSL_TAG=openssl-3.5.0
OPENSSL_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
FFMPEG_TAG=n7.1.1
FFMPEG_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
CJSON_TAG=v1.7.18
CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5

4
scripts/android-build-ffmpeg.sh
View File

@@ -1,8 +1,8 @@
#!/bin/bash
SCM_URL=https://github.com/FFmpeg/FFmpeg/archive
SCM_TAG=n7.0.1
SCM_HASH=8dab1da0c7ebccb2dce99265901f22ac40f8e0fbbe4a89a368d7645f2e79caa0
SCM_TAG=n7.1.1
SCM_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
OLD_PATH=$PATH
source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh

4
scripts/android-build-openh264.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash
SCM_URL=https://github.com/cisco/openh264/archive
SCM_TAG=v2.5.0
SCM_HASH=94c8ca364db990047ec4ec3481b04ce0d791e62561ef5601443011bdc00825e3
SCM_TAG=v2.6.0
SCM_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh

8
scripts/android-build-openssl.sh
View File

@@ -1,8 +1,8 @@
#!/bin/bash
SCM_URL=https://github.com/openssl/openssl/releases/download/
SCM_TAG=openssl-3.3.1
SCM_HASH=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e
SCM_TAG=openssl-3.5.0
SCM_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
COMPILER=4.9
@@ -19,7 +19,9 @@ function build {
common_run export CC=clang
common_run export PATH=$(${SCRIPT_PATH}/toolchains_path.py --ndk ${ANDROID_NDK}):$ORG_PATH
common_run export ANDROID_NDK
common_run export ANDROID_NDK=${ANDROID_NDK}
common_run export ANDROID_NDK_ROOT=${ANDROID_NDK}
common_run export ANDROID_NDK_HOME=${ANDROID_NDK}
echo "CONFIG=$CONFIG"
echo "DST_PREFIX=$DST_PREFIX"

12
scripts/android-build-release.conf
View File

@@ -18,12 +18,12 @@ DEPS_ONLY=0
NDK_TARGET=23
WITH_MEDIACODEC=0
OPENH264_TAG=v2.5.0
OPENH264_HASH=94c8ca364db990047ec4ec3481b04ce0d791e62561ef5601443011bdc00825e3
OPENSSL_TAG=openssl-3.4.0
OPENSSL_HASH=e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
FFMPEG_TAG=n7.1
FFMPEG_HASH=7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a
OPENH264_TAG=v2.6.0
OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
OPENSSL_TAG=openssl-3.5.0
OPENSSL_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
FFMPEG_TAG=n7.1.1
FFMPEG_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
CJSON_TAG=v1.7.18
CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5

12
scripts/android-build.conf
View File

@@ -18,12 +18,12 @@ DEPS_ONLY=0
NDK_TARGET=21
WITH_MEDIACODEC=0
OPENH264_TAG=v2.5.0
OPENH264_HASH=94c8ca364db990047ec4ec3481b04ce0d791e62561ef5601443011bdc00825e3
OPENSSL_TAG=openssl-3.4.0
OPENSSL_HASH=e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
FFMPEG_TAG=n7.1
FFMPEG_HASH=7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a
OPENH264_TAG=v2.6.0
OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
OPENSSL_TAG=openssl-3.5.0
OPENSSL_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
FFMPEG_TAG=n7.1.1
FFMPEG_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
CJSON_TAG=v1.7.18
CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5