[Android] Bump aar version and libvlcjni hashes

[Duncan McNamara]

vlc-android | branch: master | Duncan McNamara <dcn.mcnamara at gmail.com> | Wed Apr 23 14:04:36 2025 +0200| [a3d846b4f88956cb2426db5395fcb5c5b5a9500d] | committer: Duncan McNamara

Bump aar version and libvlcjni hashes

> https://code.videolan.org/videolan/vlc-android/commit/a3d846b4f88956cb2426db5395fcb5c5b5a9500d
---

 build.gradle                                                          | 4 ++--
 buildsystem/compile.sh                                                | 4 ++--
 .../{arm64-v8a-ndk26.crossfile => arm64-v8a-ndk27.crossfile}          | 0
 .../{armeabi-v7a-ndk26.crossfile => armeabi-v7a-ndk27.crossfile}      | 0
 buildsystem/crossfiles/{x86-ndk26.crossfile => x86-ndk27.crossfile}   | 0
 .../crossfiles/{x86_64-ndk26.crossfile => x86_64-ndk27.crossfile}     | 0
 buildsystem/gitlab/.gitlab-ci.yml                                     | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7004c21385..65f5e7485a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,8 +43,8 @@ ext {
     versionName = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? '4.0.0-preview - ' + versionCode : '3.6.4 Beta 4'
     vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3
     remoteAccessVersion = '0.5.0'
-    libvlcVersion = vlcMajorVersion == 3 ? '3.6.1' :'4.0.0-eap19'
-    medialibraryVersion = vlcMajorVersion == 3 ? '0.13.13-rc16' : '0.13.13-vlc4-rc16'
+    libvlcVersion = vlcMajorVersion == 3 ? '3.6.2' :'4.0.0-eap20'
+    medialibraryVersion = vlcMajorVersion == 3 ? '0.13.13-rc17' : '0.13.13-vlc4-rc17'
     minSdkVersion = 17
     targetSdkVersion = 34
     compileSdkVersion = 34
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 185e4a0b30..862110d8c6 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -280,9 +280,9 @@ fi
 
 
 if [ "$FORCE_VLC_4" = 1 ]; then
-    LIBVLCJNI_TESTED_HASH=44ca3af810d4fa315c916d7b0ebb8ecdb662d891
+    LIBVLCJNI_TESTED_HASH=306c523bfadfca021fc0758317f3f7f187f1052b
 else
-    LIBVLCJNI_TESTED_HASH=6ec2bf46d1a5d9938c5ab62fd7294f25e50c7e1a
+    LIBVLCJNI_TESTED_HASH=28b690d499711e7362eb61d03855e06e2854f396
 fi
 LIBVLCJNI_REPOSITORY=https://code.videolan.org/videolan/libvlcjni.git
 
diff --git a/buildsystem/crossfiles/arm64-v8a-ndk26.crossfile b/buildsystem/crossfiles/arm64-v8a-ndk27.crossfile
similarity index 100%
rename from buildsystem/crossfiles/arm64-v8a-ndk26.crossfile
rename to buildsystem/crossfiles/arm64-v8a-ndk27.crossfile
diff --git a/buildsystem/crossfiles/armeabi-v7a-ndk26.crossfile b/buildsystem/crossfiles/armeabi-v7a-ndk27.crossfile
similarity index 100%
rename from buildsystem/crossfiles/armeabi-v7a-ndk26.crossfile
rename to buildsystem/crossfiles/armeabi-v7a-ndk27.crossfile
diff --git a/buildsystem/crossfiles/x86-ndk26.crossfile b/buildsystem/crossfiles/x86-ndk27.crossfile
similarity index 100%
rename from buildsystem/crossfiles/x86-ndk26.crossfile
rename to buildsystem/crossfiles/x86-ndk27.crossfile
diff --git a/buildsystem/crossfiles/x86_64-ndk26.crossfile b/buildsystem/crossfiles/x86_64-ndk27.crossfile
similarity index 100%
rename from buildsystem/crossfiles/x86_64-ndk26.crossfile
rename to buildsystem/crossfiles/x86_64-ndk27.crossfile
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 3e8ebcb3aa..d37a889263 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -7,7 +7,7 @@ cache:
 
 variables:
   VLC_ANDROID_IMAGE_30: registry.videolan.org/vlc-debian-android-3.0:20230621085943
-  VLC_ANDROID_IMAGE_40: registry.videolan.org/vlc-debian-android:20240731083648
+  VLC_ANDROID_IMAGE_40: registry.videolan.org/vlc-debian-android:20250403202200
   VLC_WEB_BUILD_IMAGE: registry.videolan.org/videolan-alpine-node:20230523124511
   WEBSERVER_DIR: "./application/remote-access-client/remoteaccess"