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

android: Use NDK 17 for aarch32

Browse Source
This commit is contained in:
Matthew Bauer 2018-06-22 09:33:25 -04:00
parent fc048073e6
commit cf09ffe9aa
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/systems/examples.nix
View File

@ -31,14 +31,14 @@ rec {
armv5te-android-prebuilt = rec { armv5te-android-prebuilt = rec {
config = "armv5tel-unknown-linux-androideabi"; config = "armv5tel-unknown-linux-androideabi";
sdkVer = "21"; sdkVer = "24";
platform = platforms.armv5te-android; platform = platforms.armv5te-android;
useAndroidPrebuilt = true; useAndroidPrebuilt = true;
}; };
armv7a-android-prebuilt = rec { armv7a-android-prebuilt = rec {
config = "armv7a-unknown-linux-androideabi"; config = "armv7a-unknown-linux-androideabi";
sdkVer = "21"; sdkVer = "24";
platform = platforms.armv7a-android; platform = platforms.armv7a-android;
useAndroidPrebuilt = true; useAndroidPrebuilt = true;
}; };

4
pkgs/development/mobile/androidenv/androidndk-pkgs.nix
View File

@ -18,12 +18,12 @@ let
"armv5tel-unknown-linux-androideabi" = { "armv5tel-unknown-linux-androideabi" = {
arch = "arm"; arch = "arm";
triple = "arm-linux-androideabi"; triple = "arm-linux-androideabi";
gccVer = "4.8"; gccVer = "4.9";
}; };
"armv7a-unknown-linux-androideabi" = { "armv7a-unknown-linux-androideabi" = {
arch = "arm"; arch = "arm";
triple = "arm-linux-androideabi"; triple = "arm-linux-androideabi";
gccVer = "4.8"; gccVer = "4.9";
}; };
"aarch64-unknown-linux-android" = { "aarch64-unknown-linux-android" = {
arch = "arm64"; arch = "arm64";

4
pkgs/stdenv/cross/default.nix
View File

@ -41,9 +41,7 @@ in lib.init bootStages ++ [
targetPlatform = crossSystem; targetPlatform = crossSystem;
cc = if crossSystem.useiOSPrebuilt or false cc = if crossSystem.useiOSPrebuilt or false
then buildPackages.darwin.iosSdkPkgs.clang then buildPackages.darwin.iosSdkPkgs.clang
else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit) else if crossSystem.useAndroidPrebuilt
then buildPackages.androidenv.androidndkPkgs_10e.gcc
else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit)
then buildPackages.androidenv.androidndkPkgs.gcc then buildPackages.androidenv.androidndkPkgs.gcc
else buildPackages.gcc; else buildPackages.gcc;
}; };