summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2024-06-23 20:39:28 +0300
committerGitHub <noreply@github.com>2024-06-23 20:39:28 +0300
commit2cfac74be5087401f1383c8d3018a08b7cd088cb (patch)
tree146b75f6a77191c7a4f9017107d72b25560afe36 /lib
parentf575ce82ff5692ac203de75a006af4d4e2f49dd8 (diff)
parent56d1e7a41bbbd1ce45bb088306c65d6395e552f0 (diff)
Merge pull request #319139 from NyCodeGHG/android-ndks
android-ndks: add 25, 26 ndks, update default ndk and sdk
Diffstat (limited to 'lib')
-rw-r--r--lib/systems/examples.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 6a9427b2d9de..7e5026674843 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -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;