Skip to content

Bump android build image #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rpavlik merged 1 commit into from
Jan 22, 2025
Merged

Bump android build image #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 "$@"
)
6 changes: 3 additions & 3 deletions install-android-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions openxr-android.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 && \
Expand Down
Loading