From 914473e87b3a14075d3a612ad16e064090069ca2 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 5 May 2025 13:33:30 +0200 Subject: [PATCH] [client,android] update * update dependenciy versions in build script * update gradle dependencies --- client/Android/Studio/build.gradle | 2 +- client/Android/Studio/freeRDPCore/build.gradle | 3 ++- .../Studio/gradle/wrapper/gradle-wrapper.properties | 2 +- scripts/android-build-32.conf | 12 ++++++------ scripts/android-build-64.conf | 12 ++++++------ scripts/android-build-ffmpeg.sh | 4 ++-- scripts/android-build-openh264.sh | 4 ++-- scripts/android-build-openssl.sh | 8 +++++--- scripts/android-build-release.conf | 12 ++++++------ scripts/android-build.conf | 12 ++++++------ 10 files changed, 37 insertions(+), 34 deletions(-) diff --git a/client/Android/Studio/build.gradle b/client/Android/Studio/build.gradle index 0b3a76ecd..c3a507fa4 100644 --- a/client/Android/Studio/build.gradle +++ b/client/Android/Studio/build.gradle @@ -43,7 +43,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:8.8.0' + classpath 'com.android.tools.build:gradle:8.9.2' } } diff --git a/client/Android/Studio/freeRDPCore/build.gradle b/client/Android/Studio/freeRDPCore/build.gradle index a9ca4d1f4..26c73fe7b 100644 --- a/client/Android/Studio/freeRDPCore/build.gradle +++ b/client/Android/Studio/freeRDPCore/build.gradle @@ -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 } diff --git a/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties b/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties index ff3dd28fb..a4881f110 100644 --- a/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties +++ b/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf index dc0a6586f..99e3135c1 100644 --- a/scripts/android-build-32.conf +++ b/scripts/android-build-32.conf @@ -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 diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf index 5944d34de..70ccf1cfe 100644 --- a/scripts/android-build-64.conf +++ b/scripts/android-build-64.conf @@ -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 diff --git a/scripts/android-build-ffmpeg.sh b/scripts/android-build-ffmpeg.sh index e6b9a13fa..4e046b155 100755 --- a/scripts/android-build-ffmpeg.sh +++ b/scripts/android-build-ffmpeg.sh @@ -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 diff --git a/scripts/android-build-openh264.sh b/scripts/android-build-openh264.sh index 4808b52bd..c6c0980dc 100755 --- a/scripts/android-build-openh264.sh +++ b/scripts/android-build-openh264.sh @@ -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 diff --git a/scripts/android-build-openssl.sh b/scripts/android-build-openssl.sh index b5179b891..c678e8675 100755 --- a/scripts/android-build-openssl.sh +++ b/scripts/android-build-openssl.sh @@ -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" diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf index 93a47a6fc..2c643d41f 100644 --- a/scripts/android-build-release.conf +++ b/scripts/android-build-release.conf @@ -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 diff --git a/scripts/android-build.conf b/scripts/android-build.conf index 5f6494e97..f46c80734 100644 --- a/scripts/android-build.conf +++ b/scripts/android-build.conf @@ -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