diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-11 07:52:44 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-11 07:52:44 +0200 |
commit | c6341c279bdb69963f0e2d2a05ae3309c457a89e (patch) | |
tree | 8c185bb8f7207df55e0d145e4da1d9c9f2640f08 /lib | |
parent | be62e46e8eb962cce4dcc0d49aa8677d515d4a66 (diff) | |
parent | 230c67f43bc36f6327163a603256278c71431688 (diff) |
Merge staging-next into staging
Diffstat (limited to 'lib')
-rw-r--r-- | lib/systems/examples.nix | 8 | ||||
-rw-r--r-- | lib/systems/platforms.nix | 10 |
2 files changed, 0 insertions, 18 deletions
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"; 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"; |