matrixfurry.com / monado
The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

android: Bump compileSdk to 35

It is used to latest AndroidX libraries.

ci: Update tag and android_compile_sdk to keep sync

Signed-off-by: utzcoz <utzcoz@outlook.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2382>

authored by

utzcoz and committed by
korejan ed3b3537 e4e86b0d

+7 -7
+2 -2
.gitlab-ci.yml
··· 132 132 .monado.variables.debian:bullseye: 133 133 variables: 134 134 FDO_DISTRIBUTION_VERSION: "bullseye" 135 - FDO_DISTRIBUTION_TAG: "2025-01-11" 135 + FDO_DISTRIBUTION_TAG: "2025-01-08" 136 136 137 137 # Variables for build and usage of Debian bookworm-ndk image 138 138 .monado.variables.debian:bookworm-ndk: 139 139 variables: 140 140 FDO_DISTRIBUTION_VERSION: "bookworm" 141 - FDO_DISTRIBUTION_TAG: "2025-01-11" 141 + FDO_DISTRIBUTION_TAG: "2025-01-17" 142 142 FDO_REPO_SUFFIX: ndk 143 143 144 144 # Variables for build and usage of Ubuntu jammy image
+3 -3
.gitlab-ci/config.yml
··· 118 118 XRT_HAVE_OPENCV: "OFF" 119 119 120 120 - codename: bullseye 121 - tag: "2025-01-11" 121 + tag: "2025-01-08" 122 122 script: bullseye_backports.sh 123 123 deb_version_suffix: bpo11 124 124 packages: ··· 133 133 distro_version: bookworm 134 134 repo_suffix: ndk 135 135 script: android_container_prep.sh 136 - tag: "2025-01-11" 136 + tag: "2025-01-17" 137 137 # This must match ext.sharedCompileSdk in build.gradle 138 - android_compile_sdk: 34 138 + android_compile_sdk: 35 139 139 # This must match buildscript.ext.buildToolsVersion in build.gradle 140 140 android_build_tools: 34.0.0 141 141 # This must match ext.ndk_version in build.gradle
+1 -1
.gitlab-ci/install-android-sdk.sh
··· 14 14 set -eo pipefail 15 15 VERSION=11076708 16 16 ROOT=${ROOT:-/opt/android-sdk} 17 - ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-34} 17 + ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-35} 18 18 ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0} 19 19 20 20 mkdir -p "$ROOT"
+1 -1
build.gradle
··· 73 73 cmake_version = '3.22.1' 74 74 ndk_version = '26.3.11579264' 75 75 // If you update this, must also update .gitlab-ci/config.yml 76 - sharedCompileSdk = 34 76 + sharedCompileSdk = 35 77 77 sharedTargetSdk = 31 78 78 sharedMinSdk = 26 79 79