From ac491d2df7365b304b96a1f3606ae8ba1522ed7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 10 Apr 2019 01:31:04 -0400 Subject: [PATCH] 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(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 03bfce256103..92de30162666 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 ab206158959d..fbd4fdf3d6bd 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" = {