Unverified Commit ded820fb authored by Hadi's avatar Hadi
Browse files

androidenv: update jdk to 17

parent 67343f66

pkgs/development/mobile/androidenv/cmdline-tools.nix

+2 −2
Original line number Diff line number Diff line
@@ -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