Force Android Qt 6 packages to use Java 17

This may help to prevent https://bugreports.qt.io/browse/QTBUG-119223.

3 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b979e0399b8e..bbf58ffadec9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,7 @@ pkgbase = android-aarch64-qt6-shadertools
 	makedepends = android-cmake
 	makedepends = qt6-shadertools
 	makedepends = ninja
-	makedepends = java-environment-openjdk>=11
+	makedepends = java-environment-openjdk=17
 	depends = android-aarch64-qt6-base
 	optdepends = qt6-shadertools: development tools
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index cb5d730d78b3..4fa4ad996263 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Experimental module providing APIs and a host tool to host tool to perform graphics and compute shader conditioning for the upcoming Qt graphics abstraction layer (android)'
 depends=('android-aarch64-qt6-base')
-makedepends=('android-cmake' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11')
+makedepends=('android-cmake' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17')
 optdepends=('qt6-shadertools: development tools')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(android-${_android_arch}-qt6)
@@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('628bead7ff4e7f42cb910f47d2adefbdea0d8c71a0234baef8ca709bf467b92f')
 
 build() {
+  export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH
   source android-env ${_android_arch}
   android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \
     -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 86414fbf52d6..a9028487efc7 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -8,5 +8,5 @@ url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Experimental module providing APIs and a host tool to host tool to perform graphics and compute shader conditioning for the upcoming Qt graphics abstraction layer (android)'
 depends=(<%== qt6deps qw(base) %>)
-makedepends=('android-cmake<%== $static_suffix %>' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11')
+makedepends=('android-cmake<%== $static_suffix %>' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17')
 optdepends=('qt6-shadertools: development tools')