From ed3b353755ffe16dee277b89dd06ba196705e6e2 Mon Sep 17 00:00:00 2001
From: utzcoz <utzcoz@outlook.com>
Date: Sat, 28 Dec 2024 13:40:50 +0800
Subject: [PATCH] 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>
---
 .gitlab-ci.yml                    | 4 ++--
 .gitlab-ci/config.yml             | 6 +++---
 .gitlab-ci/install-android-sdk.sh | 2 +-
 build.gradle                      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5933acde6..56e7e15a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,13 +132,13 @@ win:container_prep:
 .monado.variables.debian:bullseye:
   variables:
     FDO_DISTRIBUTION_VERSION: "bullseye"
-    FDO_DISTRIBUTION_TAG: "2025-01-11"
+    FDO_DISTRIBUTION_TAG: "2025-01-08"
 
 # Variables for build and usage of Debian bookworm-ndk image
 .monado.variables.debian:bookworm-ndk:
   variables:
     FDO_DISTRIBUTION_VERSION: "bookworm"
-    FDO_DISTRIBUTION_TAG: "2025-01-11"
+    FDO_DISTRIBUTION_TAG: "2025-01-17"
     FDO_REPO_SUFFIX: ndk
 
 # Variables for build and usage of Ubuntu jammy image
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 1f56b380a..fe1f0e224 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -118,7 +118,7 @@ distributions:
               XRT_HAVE_OPENCV: "OFF"
 
       - codename: bullseye
-        tag: "2025-01-11"
+        tag: "2025-01-08"
         script: bullseye_backports.sh
         deb_version_suffix: bpo11
         packages:
@@ -133,9 +133,9 @@ distributions:
         distro_version: bookworm
         repo_suffix: ndk
         script: android_container_prep.sh
-        tag: "2025-01-11"
+        tag: "2025-01-17"
         # This must match ext.sharedCompileSdk in build.gradle
-        android_compile_sdk: 34
+        android_compile_sdk: 35
         # This must match buildscript.ext.buildToolsVersion in build.gradle
         android_build_tools: 34.0.0
         # This must match ext.ndk_version in build.gradle
diff --git a/.gitlab-ci/install-android-sdk.sh b/.gitlab-ci/install-android-sdk.sh
index b7f3baf43..fbb0b2fef 100755
--- a/.gitlab-ci/install-android-sdk.sh
+++ b/.gitlab-ci/install-android-sdk.sh
@@ -14,7 +14,7 @@
 set -eo pipefail
 VERSION=11076708
 ROOT=${ROOT:-/opt/android-sdk}
-ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-34}
+ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-35}
 ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0}
 
 mkdir -p "$ROOT"
diff --git a/build.gradle b/build.gradle
index 287802c53..ddf7b75bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ ext {
     cmake_version = '3.22.1'
     ndk_version = '26.3.11579264'
     // If you update this, must also update .gitlab-ci/config.yml
-    sharedCompileSdk = 34
+    sharedCompileSdk = 35
     sharedTargetSdk = 31
     sharedMinSdk = 26