From 589c2c2870340c21b799795f6ed3b09608676499 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 10 Apr 2019 01:23:02 -0400 Subject: androidndk: fixup mess MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New android ndk (18) now uses clang. We were going through the wrapper that are provided. This lead to surprising errors when building. Ideally we could use the llvm linker as well, but this leads to errors as many packages don’t support the llvm linker. --- lib/systems/examples.nix | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib') diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 28a8d3cb9eb9e..3e90c5ec22732 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -44,14 +44,6 @@ rec { platform = platforms.aarch64-multiplatform; }; - armv5te-android-prebuilt = rec { - config = "armv5tel-unknown-linux-androideabi"; - sdkVer = "21"; - ndkVer = "18b"; - platform = platforms.armv5te-android; - useAndroidPrebuilt = true; - }; - armv7a-android-prebuilt = rec { config = "armv7a-unknown-linux-androideabi"; sdkVer = "24"; -- cgit 1.4.1 From ac491d2df7365b304b96a1f3606ae8ba1522ed7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 10 Apr 2019 01:31:04 -0400 Subject: systems: remove android armv5te platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this isn’t useful any more because the ndk we use no longer supports it. --- lib/systems/platforms.nix | 10 ---------- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 03bfce256103c..92de30162666a 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -253,16 +253,6 @@ rec { kernelTarget = "zImage"; }; - # https://developer.android.com/ndk/guides/abis#armeabi - armv5te-android = { - name = "armeabi"; - gcc = { - arch = "armv5te"; - float = "soft"; - float-abi = "soft"; - }; - }; - # https://developer.android.com/ndk/guides/abis#v7a armv7a-android = { name = "armeabi-v7a"; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index ab206158959d5..fbd4fdf3d6bd1 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -27,7 +27,7 @@ let "x86_64-unknown-linux-android" = { triple = "x86_64-linux-android"; arch = "x86_64"; - toolchain = "x86"; + toolchain = "x86_64"; gccVer = "4.9"; }; "armv7a-unknown-linux-androideabi" = { -- cgit 1.4.1