Browse Source

Bump aar version and libvlcjni hashes

merge-requests/2231/head libvlc-3.6.2
Duncan McNamara 12 months ago
parent
commit
a3d846b4f8
  1. 4
      build.gradle
  2. 4
      buildsystem/compile.sh
  3. 0
      buildsystem/crossfiles/arm64-v8a-ndk27.crossfile
  4. 0
      buildsystem/crossfiles/armeabi-v7a-ndk27.crossfile
  5. 0
      buildsystem/crossfiles/x86-ndk27.crossfile
  6. 0
      buildsystem/crossfiles/x86_64-ndk27.crossfile
  7. 2
      buildsystem/gitlab/.gitlab-ci.yml

4
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

4
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

0
buildsystem/crossfiles/arm64-v8a-ndk26.crossfile → buildsystem/crossfiles/arm64-v8a-ndk27.crossfile

0
buildsystem/crossfiles/armeabi-v7a-ndk26.crossfile → buildsystem/crossfiles/armeabi-v7a-ndk27.crossfile

0
buildsystem/crossfiles/x86-ndk26.crossfile → buildsystem/crossfiles/x86-ndk27.crossfile

0
buildsystem/crossfiles/x86_64-ndk26.crossfile → buildsystem/crossfiles/x86_64-ndk27.crossfile

2
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"

Loading…
Cancel
Save