diff options
-rw-r--r-- | lib/systems/examples.nix | 5 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 12 | ||||
-rw-r--r-- | pkgs/stdenv/cross/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 15 insertions, 12 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 4c7dd9917919..108996206a7d 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -32,13 +32,15 @@ rec { armv5te-android-prebuilt = rec { config = "armv5tel-unknown-linux-androideabi"; sdkVer = "21"; + ndkVer = "10e"; platform = platforms.armv5te-android; useAndroidPrebuilt = true; }; armv7a-android-prebuilt = rec { config = "armv7a-unknown-linux-androideabi"; - sdkVer = "21"; + 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; }; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 9541d62e1601..5c42f7bc3289 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -23,7 +23,7 @@ let "armv7a-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; - gccVer = "4.8"; + gccVer = "4.9"; }; "aarch64-unknown-linux-android" = { arch = "arm64"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index d6d6b8a0cadc..3e1f00d6ad5a 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -246,7 +246,7 @@ rec { sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw"; }; - androidndk = import ./androidndk.nix { + androidndk_17 = import ./androidndk.nix { inherit (buildPackages) p7zip makeWrapper; inherit (pkgs) @@ -256,6 +256,7 @@ rec { version = "17"; sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds"; }; + androidndk = androidndk_17; androidndk_r8e = import ./androidndk_r8e.nix { inherit (buildPackages) @@ -276,7 +277,7 @@ rec { inherit androidsdk; }; - androidndkPkgs = import ./androidndk-pkgs.nix { + androidndkPkgs_17 = import ./androidndk-pkgs.nix { inherit (buildPackages) makeWrapper; inherit (pkgs) @@ -286,10 +287,11 @@ rec { # but for splicing messing up on infinite recursion for the variants we # *dont't* use. Using this workaround, but also making a test to ensure # these two really are the same. - buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk; - inherit androidndk; - targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs; + buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17; + androidndk = androidndk_17; + targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17; }; + androidndkPkgs = androidndkPkgs_17; androidndkPkgs_10e = import ./androidndk-pkgs.nix { inherit (buildPackages) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 41b5fd99504d..ab42dd319a62 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -41,10 +41,8 @@ in lib.init bootStages ++ [ targetPlatform = crossSystem; cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang - else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit) - then buildPackages.androidenv.androidndkPkgs_10e.gcc - else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit) - then buildPackages.androidenv.androidndkPkgs.gcc + else if crossSystem.useAndroidPrebuilt + then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc else buildPackages.gcc; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 288f4a5885a0..3b5ec53bd5dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8699,7 +8699,7 @@ with pkgs; # TODO(@Ericson2314): Build bionic libc from source bionic = assert hostPlatform.useAndroidPrebuilt; - androidenv.androidndkPkgs.libraries; + androidenv."androidndkPkgs_${hostPlatform.ndkVer}".libraries; bobcat = callPackage ../development/libraries/bobcat { }; |