diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2022-07-18 10:01:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-18 10:01:00 +0200 |
| commit | 9532db9eb78f59c167e577e524dc35a2217e9e3f (patch) | |
| tree | 27c4cbbc9b86da1aa228d49c33b5c8fea9b04c5a /lib/systems | |
| parent | ae0b8a01b10a689d0d33e9024b8480069e5c854d (diff) | |
| parent | 2408ef3c6faa0ba0d513257378563ddc886f1020 (diff) | |
Merge pull request #160554 from Cloudef/android-prebuilt
Fix android prebuilt toolchains
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/default.nix | 1 | ||||
| -rw-r--r-- | lib/systems/examples.nix | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index d9d0918c1cc69..25340825c4b5e 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -36,6 +36,7 @@ rec { config = parse.tripleFromSystem final.parsed; # Determine whether we can execute binaries built for the provided platform. canExecute = platform: + final.isAndroid == platform.isAndroid && parse.isCompatible final.parsed.cpu platform.parsed.cpu && final.parsed.kernel == platform.parsed.kernel; isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details"; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 03bb5ffcdacc2..65dc9c07e3465 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -57,23 +57,23 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; rustc.config = "armv7-linux-androideabi"; - sdkVer = "29"; - ndkVer = "21"; + sdkVer = "28"; + ndkVer = "24"; useAndroidPrebuilt = true; } // platforms.armv7a-android; aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; rustc.config = "aarch64-linux-android"; - sdkVer = "29"; - ndkVer = "21"; + sdkVer = "28"; + ndkVer = "24"; useAndroidPrebuilt = true; }; aarch64-android = { config = "aarch64-unknown-linux-android"; sdkVer = "30"; - ndkVer = "21"; + ndkVer = "24"; libc = "bionic"; useAndroidPrebuilt = false; useLLVM = true; |