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

Configure Feed

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

ci: Use JDK17 to build Android targets

The latest AGP 8.x needs JDK17.

Signed-off-by: utzcoz <utzcoz@outlook.com>

authored by

utzcoz and committed by
Rylie Pavlik 024d952d 671639fd

+3 -3
+2 -2
.gitlab-ci.yml
··· 135 135 .monado.variables.debian:bullseye-ndk: 136 136 variables: 137 137 FDO_DISTRIBUTION_VERSION: "bullseye" 138 - FDO_DISTRIBUTION_TAG: "2023-04-10.1" 138 + FDO_DISTRIBUTION_TAG: "2023-10-28.0" 139 139 FDO_REPO_SUFFIX: ndk 140 140 141 141 # Variables for build and usage of Ubuntu focal image ··· 179 179 - .fdo.container-build@debian # from ci-templates 180 180 181 181 variables: 182 - FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake default-jdk-headless git glslang-tools libeigen3-dev meson ninja-build pkg-config python3 unzip wget' 182 + FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake git glslang-tools libeigen3-dev meson ninja-build openjdk-17-jdk-headless pkg-config python3 unzip wget' 183 183 FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/android_container_prep.sh' 184 184 185 185 # Make Ubuntu focal image
+1 -1
.gitlab-ci/config.yml
··· 138 138 pkg-config: 139 139 ca-certificates: 140 140 glslang-tools: 141 - default-jdk-headless: 141 + openjdk-17-jdk-headless: 142 142 build_jobs: 143 143 - name: "ndk:armeabi-v7a" 144 144 cmake_defines: