From 488ee616e5c94e516563095c6b3ac3a85cf72871 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 1 Aug 2022 17:45:26 +0200
Subject: [PATCH] ci: android: use last image and last build script
Last image that contains the NDK25.
---
extras/ci/gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 53f3c60c5546..d5471a7974d2 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -24,7 +24,7 @@ variables:
VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20220705072259
VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20220713124227
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20210803114245
- VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20220505164734
+ VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20220728132611
VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20220505174948
VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-ubuntu-raspberry:20220505175523
VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20210915101305
@@ -447,11 +447,12 @@ tvos-arm64:
image:
name: $VLC_ANDROID_IMAGE
script: |
- wget https://code.videolan.org/videolan/vlc-android/raw/fd4d934ad31d37f3eeaa834214ca16eb0d4ecb6a/buildsystem/compile-libvlc.sh
+ git clone https://code.videolan.org/videolan/libvlcjni.git
+ (cd libvlcjni && git checkout 005bcdb4be46509fe9d8428d4ff5bcdc7d8a8d99)
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
- /bin/sh ./compile-libvlc.sh -a $ANDROID_ARCH --with-prebuilt-contribs
+ /bin/sh ./libvlcjni/buildsysten/compile-libvlc.sh -a $ANDROID_ARCH --with-prebuilt-contribs
else
- /bin/sh ./compile-libvlc.sh -a $ANDROID_ARCH --package-contribs
+ /bin/sh ./libvlcjni/buildsystem/compile-libvlc.sh -a $ANDROID_ARCH --package-contribs
fi
android-arm:
--
GitLab