diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 0981122388bb..9eacf831bac5 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -255,6 +255,22 @@ let if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET" else if final.isiOS then "IPHONEOS_DEPLOYMENT_TARGET" else null; + + # Remove before 25.05 + androidSdkVersion = + if (args ? sdkVer && !args ? androidSdkVersion) then + throw "For android `sdkVer` has been renamed to `androidSdkVersion`" + else if (args ? androidSdkVersion) then + args.androidSdkVersion + else + null; + androidNdkVersion = + if (args ? ndkVer && !args ? androidNdkVersion) then + throw "For android `ndkVer` has been renamed to `androidNdkVersion`" + else if (args ? androidSdkVersion) then + args.androidNdkVersion + else + null; } // ( let selectEmulator = pkgs: diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 0fc37fa715a6..ae76569ad859 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -60,6 +60,8 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; rustc.config = "armv7-linux-androideabi"; + androidSdkVersion = "28"; + androidNdkVersion = "24"; useAndroidPrebuilt = true; } // platforms.armv7a-android;