androidenv: update jdk to 17 (#353914)

2024-11-06 08:16:36 -05:00
parent 17f287e08d ded820fb03
commit 00e32f152b
1 changed files with 2 additions and 2 deletions
@@ -18,14 +18,14 @@ deployAndroidPackage {
    # Wrap all scripts that require JAVA_HOME
    find $ANDROID_SDK_ROOT/${package.path}/bin -maxdepth 1 -type f -executable | while read program; do
      if grep -q "JAVA_HOME" $program; then
-        wrapProgram $program  --prefix PATH : ${pkgs.jdk11}/bin \
+        wrapProgram $program  --prefix PATH : ${pkgs.jdk17}/bin \
          --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT
      fi
    done

    # Wrap sdkmanager script
    wrapProgram $ANDROID_SDK_ROOT/${package.path}/bin/sdkmanager \
-      --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \
+      --prefix PATH : ${lib.makeBinPath [ pkgs.jdk17 ]} \
      --add-flags "--sdk_root=$ANDROID_SDK_ROOT"

    # Patch all script shebangs