Merge branch 'drop-jdk-17-from-devshell'main

4 files changed, 21 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index f164000ccc..e35b317a15 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,7 +48,6 @@
             pkgs
             nixpkgs
             android-nixpkgs
-            system
             common-toolchain
             ;
         };
diff --git a/nix/android-devshell.nix b/nix/android-devshell.nix
index c989984469..be769144ce 100644
--- a/nix/android-devshell.nix
+++ b/nix/android-devshell.nix
@@ -7,6 +7,7 @@ pkgs.devshell.mkShell {
     inherit pkgs;
     inherit (android-toolchain)
       android-sdk
+      jdk
       buildToolsVersion
       ndkVersion
       minSdkVersion
diff --git a/nix/android-env.nix b/nix/android-env.nix
index 470b226189..5ba718f594 100644
--- a/nix/android-env.nix
+++ b/nix/android-env.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   android-sdk,
+  jdk,
   buildToolsVersion,
   ndkVersion,
   minSdkVersion,
@@ -19,7 +20,7 @@ in
 [
   {
     name = "JAVA_HOME";
-    value = "${pkgs.jdk17}";
+    value = "${jdk}";
   }
   {
     name = "PROTOC_GEN_GRPC_JAVA_PLUGIN";
diff --git a/nix/android-toolchain.nix b/nix/android-toolchain.nix
index b1b19551c1..8dfdc71141 100644
--- a/nix/android-toolchain.nix
+++ b/nix/android-toolchain.nix
@@ -2,7 +2,6 @@
   pkgs,
   nixpkgs,
   android-nixpkgs,
-  system,
   common-toolchain,
 }:
 let
@@ -22,16 +21,23 @@ let
   buildToolsVersion = versions."build-tools";
   minSdkVersion = versions."min-sdk";
   ndkVersion = versions.ndk;
+  jdk = pkgs."jdk${versions."jvm-toolchain"}";
 
-  android-sdk = android-nixpkgs.sdk.${system} (
-    sdkPkgs: with sdkPkgs; [
-      (builtins.getAttr "platforms-android-${compileSdkVersion}-${compileSdkMinorVersion}" sdkPkgs)
-      (builtins.getAttr "build-tools-${builtins.replaceStrings [ "." ] [ "-" ] buildToolsVersion}" sdkPkgs)
-      (builtins.getAttr "ndk-${builtins.replaceStrings [ "." ] [ "-" ] ndkVersion}" sdkPkgs)
-      cmdline-tools-latest
-      platform-tools
-    ]
-  );
+  android-sdk =
+    (import "${android-nixpkgs}" {
+      pkgs = pkgs // {
+        openjdk = jdk;
+      };
+    }).sdk
+      (
+        sdkPkgs: with sdkPkgs; [
+          (builtins.getAttr "platforms-android-${compileSdkVersion}-${compileSdkMinorVersion}" sdkPkgs)
+          (builtins.getAttr "build-tools-${builtins.replaceStrings [ "." ] [ "-" ] buildToolsVersion}" sdkPkgs)
+          (builtins.getAttr "ndk-${builtins.replaceStrings [ "." ] [ "-" ] ndkVersion}" sdkPkgs)
+          cmdline-tools-latest
+          platform-tools
+        ]
+      );
 
   rust-toolchain = common-toolchain.rust-toolchain-base.override {
     extensions = [ "rust-analyzer" ];
@@ -47,6 +53,7 @@ in
   inherit
     android-sdk
     rust-toolchain
+    jdk
     buildToolsVersion
     ndkVersion
     minSdkVersion
@@ -58,7 +65,7 @@ in
       android-sdk
       rust-toolchain
       pkgs.protoc-gen-grpc-java
-      pkgs.jdk17
+      jdk
       pkgs.python314
     ]
     ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];