summary refs log tree commit diff
path: root/lib/systems
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2018-05-11 19:01:22 -0400
committerGitHub <noreply@github.com>2018-05-11 19:01:22 -0400
commit98a1b899455fe138013770426bd9f0d64da20b64 (patch)
treef1d663c8c827deb079f22d65191cd2330c889ff3 /lib/systems
parent2490c50346250a15d84067b16722a1a9ec3e2aae (diff)
parente3f6c6d18d8ffbb4f9462adbf6648500b9514bbb (diff)
downloadnixlib-98a1b899455fe138013770426bd9f0d64da20b64.tar
nixlib-98a1b899455fe138013770426bd9f0d64da20b64.tar.gz
nixlib-98a1b899455fe138013770426bd9f0d64da20b64.tar.bz2
nixlib-98a1b899455fe138013770426bd9f0d64da20b64.tar.lz
nixlib-98a1b899455fe138013770426bd9f0d64da20b64.tar.xz
nixlib-98a1b899455fe138013770426bd9f0d64da20b64.tar.zst
nixlib-98a1b899455fe138013770426bd9f0d64da20b64.zip
Merge pull request #40385 from obsidiansystems/lib-android-platforms
lib: Add 32-bit Android platforms
Diffstat (limited to 'lib/systems')
-rw-r--r--lib/systems/examples.nix12
-rw-r--r--lib/systems/platforms.nix21
2 files changed, 33 insertions, 0 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 063878d63b87..897ba448b951 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -29,6 +29,18 @@ rec {
     platform = platforms.aarch64-multiplatform;
   };
 
+  armv5te-android-prebuilt = rec {
+    config = "armv5tel-unknown-linux-androideabi";
+    platform = platforms.armv5te-android;
+    useAndroidPrebuilt = true;
+  };
+
+  armv7a-android-prebuilt = rec {
+    config = "armv7a-unknown-linux-androideabi";
+    platform = platforms.armv7a-android;
+    useAndroidPrebuilt = true;
+  };
+
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
     platform = platforms.aarch64-multiplatform;
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index cceaecf01843..5becaf581a45 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -384,6 +384,27 @@ 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";
+    gcc = {
+      arch = "armv7-a";
+      float = "hard";
+      float-abi = "softfp";
+      fpu = "vfpv3-d16";
+    };
+  };
+
   armv7l-hf-multiplatform = {
     name = "armv7l-hf-multiplatform";
     kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.