diff options
| author | Artturin | 2024-08-17 19:22:42 +0300 |
|---|---|---|
| committer | GitHub | 2024-08-17 19:22:42 +0300 |
| commit | c9270f6274f7257d267a985e70644db7ac6e0786 (patch) | |
| tree | e42cceec48c824de15c3afd4896fcd719de62f1c /lib | |
| parent | b9a1e5555ac089e2c57446fceeba95793796c73e (diff) | |
| parent | 35e5943d69e0bfd7d3f265bf91f27b3c32b41d1b (diff) | |
Merge pull request #329964 from Artturin/androidrenamesdk
treewide: Rename android `sdkVer` and `ndkVer`
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/default.nix | 16 | ||||
| -rw-r--r-- | lib/systems/examples.nix | 12 |
2 files changed, 22 insertions, 6 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index e8384a6938fc..cee09791bf54 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -257,6 +257,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 178536efb009..971f6b87364b 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 = "33"; - ndkVer = "26"; + androidSdkVersion = "33"; + androidNdkVersion = "26"; useAndroidPrebuilt = true; } // platforms.armv7a-android; aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; rust.rustcTarget = "aarch64-linux-android"; - sdkVer = "33"; - ndkVer = "26"; + androidSdkVersion = "33"; + androidNdkVersion = "26"; useAndroidPrebuilt = true; }; aarch64-android = { config = "aarch64-unknown-linux-android"; - sdkVer = "33"; - ndkVer = "26"; + androidSdkVersion = "33"; + androidNdkVersion = "26"; libc = "bionic"; useAndroidPrebuilt = false; useLLVM = true; |