Commit 56d1e7a4 authored by Marie Ramlow's avatar Marie Ramlow
Browse files

lib.systems.examples: update default android sdk to 33, ndk to 26

parent 13effc43

lib/systems/examples.nix

+6 −6
Original line number Diff line number Diff line
@@ -60,23 +60,23 @@ rec { 
  armv7a-android-prebuilt = {

    config = "armv7a-unknown-linux-androideabi";

    rust.rustcTarget = "armv7-linux-androideabi";

    sdkVer = "28";

    ndkVer = "24";

    sdkVer = "33";

    ndkVer = "26";

    useAndroidPrebuilt = true;

  } // platforms.armv7a-android;



  aarch64-android-prebuilt = {

    config = "aarch64-unknown-linux-android";

    rust.rustcTarget = "aarch64-linux-android";

    sdkVer = "28";

    ndkVer = "24";

    sdkVer = "33";

    ndkVer = "26";

    useAndroidPrebuilt = true;

  };



  aarch64-android = {

    config = "aarch64-unknown-linux-android";

    sdkVer = "30";

    ndkVer = "24";

    sdkVer = "33";

    ndkVer = "26";

    libc = "bionic";

    useAndroidPrebuilt = false;

    useLLVM = true;

nixos/doc/manual/release-notes/rl-2411.section.md

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ 
  before changing the package to `pkgs.stalwart-mail` in

  [`services.stalwart-mail.package`](#opt-services.stalwart-mail.package).



- `androidndkPkgs` has been updated to `androidndkPkgs_26`.



- Android NDK version 26 and SDK version 33 are now the default versions used for cross compilation to android.



- `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in the

  output by default, to alert users to closure size issues caused by

  [#164630](https://github.com/NixOS/nixpkgs/issues/164630). See ["Packaging

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -4079,7 +4079,7 @@ with pkgs; 














  androidenv = callPackage ../development/mobile/androidenv { };



























  androidndkPkgs = androidndkPkgs_21;













  androidndkPkgs = androidndkPkgs_26;















  androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21";















  androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b";















  androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24";