public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: add ndkVer to resolve ndk ambiguity

Browse Source 
It wasn’t exactly clear which NDK you were using previously. This adds
an attribute to system that handles what version of the NDK we should
use when building things.

/cc @Ericson2314
This commit is contained in:
Matthew Bauer
2018-06-22 10:21:43 -04:00
parent cf09ffe9aa
commit c8fd285c8d
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/systems/examples.nix
View File

@@ -31,7 +31,8 @@ rec {
armv5te-android-prebuilt = rec {
config = "armv5tel-unknown-linux-androideabi";
sdkVer = "24";
sdkVer = "21";
ndkVer = "10e";
platform = platforms.armv5te-android;
useAndroidPrebuilt = true;
};
@@ -39,6 +40,7 @@ rec {
armv7a-android-prebuilt = rec {
config = "armv7a-unknown-linux-androideabi";
sdkVer = "24";
ndkVer = "17";
platform = platforms.armv7a-android;
useAndroidPrebuilt = true;
};
@@ -46,6 +48,7 @@ rec {
aarch64-android-prebuilt = rec {
config = "aarch64-unknown-linux-android";
sdkVer = "24";
ndkVer = "17";
platform = platforms.aarch64-multiplatform;
useAndroidPrebuilt = true;
};