From 362dfd1dcd3c795f16c5c0f4c902dcc816bad845 Mon Sep 17 00:00:00 2001
From: Rylie Pavlik <rylie.pavlik@collabora.com>
Date: Tue, 21 Jan 2025 18:26:57 -0600
Subject: [PATCH] Bump android build image

---
 build-all.sh              | 4 ++--
 install-android-sdk.sh    | 6 +++---
 openxr-android.Dockerfile | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-all.sh b/build-all.sh
index 592ebb2..5f36fc0 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2019-2024, The Khronos Group Inc.
+# Copyright 2019-2025, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 set -e
@@ -17,5 +17,5 @@ set -e
     ./build-one.sh openxr 20240924 "$@"
     ./build-one.sh openxr-sdk 20240924 "$@"
     ./build-one.sh openxr-pregenerated-sdk 20240924 "$@"
-    ./build-one.sh openxr-android 20240924 "$@"
+    ./build-one.sh openxr-android 20250121 "$@"
 )
diff --git a/install-android-sdk.sh b/install-android-sdk.sh
index 33e861d..a92a1e9 100755
--- a/install-android-sdk.sh
+++ b/install-android-sdk.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2022-2024, Collabora, Ltd. and the Monado contributors
+# Copyright 2022-2025, Collabora, Ltd. and the Monado contributors
 #
 # SPDX-License-Identifier: BSL-1.0
 
@@ -8,8 +8,8 @@
 
 set -eo pipefail
 # These normally come from the environment but we have defaults
-ANDROID_CLI_TOOLS=${ANDROID_CLI_TOOLS:-10406996}
-ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-33}
+ANDROID_CLI_TOOLS=${ANDROID_CLI_TOOLS:-11076708}
+ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-34}
 ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0}
 ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-23.2.8568313}
 ANDROID_CMAKE_VERSION=${ANDROID_CMAKE_VERSION:-3.22.1}
diff --git a/openxr-android.Dockerfile b/openxr-android.Dockerfile
index 699f31f..5ee4be5 100644
--- a/openxr-android.Dockerfile
+++ b/openxr-android.Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -64,7 +64,7 @@ USER openxr
 WORKDIR /home/openxr
 
 # Cache the gradle wrapper in the image
-ENV CACHED_GRADLE_WRAPPER_VERSION=7.5
+ENV CACHED_GRADLE_WRAPPER_VERSION=8.5
 RUN mkdir -p temp_proj && \
     cd temp_proj && \
     gradle -Porg.gradle.daemon=false init && \