Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 62ccc2324f6b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c674fa8eac30
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 11, 2018

  1. lib: Add 32-bit Android platforms

    @Ericson2314
    Ericson2314 committed May 11, 2018
    Copy the full SHA
    e3f6c6d View commit details

  2. Merge pull request #40386 from obsidiansystems/lib-android-platforms 

    lib: Add 32-bit Android platforms
    @Ericson2314
    Ericson2314 authored May 11, 2018
    Copy the full SHA
    c674fa8 View commit details
Showing with 33 additions and 0 deletions.
  1. +12 −0 lib/systems/examples.nix
  2. +21 −0 lib/systems/platforms.nix
12 changes: 12 additions & 0 deletions lib/systems/examples.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
21 changes: 21 additions & 0 deletions lib/systems/platforms.nix
View file
Original file line number Diff line number Diff line change
@@ -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.