summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2023-05-31 11:31:21 +1000
committerMatthew Waters <matthew@centricular.com>2023-06-04 13:42:51 +1000
commitf2e8d34e7db81b3f21a3217c274881d21e086896 (patch)
tree05c18dcd60467a2b6ef9b0037d15fb9029d6f2d2 /ci
parentc98965ebc56c9209075d63057cb8b0002122abf7 (diff)
ci: update android sdk/ndk
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1191>
Diffstat (limited to 'ci')
-rwxr-xr-xci/docker_android_setup.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/docker_android_setup.sh b/ci/docker_android_setup.sh
index aace7823..1a53b024 100755
--- a/ci/docker_android_setup.sh
+++ b/ci/docker_android_setup.sh
@@ -6,12 +6,12 @@ DEFAULT_BRANCH=$3
mkdir -p /android/sources
-curl -o /android/sources/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip
+curl -o /android/sources/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
unzip /android/sources/android-ndk.zip -d ${ANDROID_NDK_HOME}/
# remove the intermediate versioned directory
mv ${ANDROID_NDK_HOME}/*/* ${ANDROID_NDK_HOME}/
-curl -o /android/sources/android-sdk-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip
+curl -o /android/sources/android-sdk-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
unzip /android/sources/android-sdk-tools.zip -d ${ANDROID_HOME}/
mkdir -p ${ANDROID_HOME}/licenses
@@ -28,7 +28,7 @@ echo "e9acab5b5fbb560a72cfaecce8946896ff6aab9d" > ${ANDROID_HOME}/licenses/mips-
# pre-cache deps
export GSTREAMER_ROOT_ANDROID=/android/sources/gstreamer-android
-curl -o /android/sources/gstreamer-android.tar.xz https://gstreamer.freedesktop.org/data/pkg/android/1.20.0/gstreamer-1.0-android-universal-1.20.0.tar.xz
+curl -o /android/sources/gstreamer-android.tar.xz https://gstreamer.freedesktop.org/data/pkg/android/1.22.0/gstreamer-1.0-android-universal-1.22.0.tar.xz
mkdir $GSTREAMER_ROOT_ANDROID
tar -xvf /android/sources/gstreamer-android.tar.xz -C $GSTREAMER_ROOT_ANDROID
ls $GSTREAMER_ROOT_ANDROID