Skip to content

Commit

Permalink
Make Android a Tier 2 target
Browse files Browse the repository at this point in the history
  • Loading branch information
roblabla committed Jul 4, 2017
1 parent 7c9c167 commit f8a6951
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
16 changes: 2 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ matrix:
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
rust: 1.13.0
- env: TARGET=i686-linux-android DISABLE_TESTS=1
rust: 1.13.0
rust: 1.18.0
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
rust: 1.13.0
rust: 1.18.0

# iOS
- env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
Expand Down Expand Up @@ -104,18 +104,6 @@ matrix:
rust: nightly

allow_failures:
# Android (in the process of fixing these, so they're allowed to fail for now)
- env: TARGET=aarch64-linux-android DISABLE_TESTS=1
rust: 1.13.0
- env: TARGET=arm-linux-androideabi DISABLE_TESTS=1
rust: 1.13.0
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
rust: 1.13.0
- env: TARGET=i686-linux-android DISABLE_TESTS=1
rust: 1.13.0
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
rust: 1.13.0

# iOS is still being worked on, so for now don't block on compilation failures
- env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
rust: 1.13.0
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Changed type signature of `sys::select::FdSet::contains` to make `self`
immutable ([#564](https://github.com/nix-rust/nix/pull/564))
- Changed type of `sched::sched_setaffinity`'s `pid` argument to `pid_t`
- Promoted all Android targets to Tier 2 support

### Removed
- Removed io::Error from nix::Error and conversion from nix::Error to Errno
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ limitations. Support for platforms is split into two tiers:
*do not* block the inclusion of new code. Testing may be run, but
failures in tests don't block the inclusion of new code.

The following targets are all supported by nix on Rust 1.13.0 or newer:
The following targets are all supported by nix on Rust 1.13.0 or newer (unless
otherwise noted):

Tier 1:
* i686-unknown-linux-gnu
Expand All @@ -68,18 +69,18 @@ Tier 1:
Tier 2:
* i686-unknown-freebsd
* x86_64-unknown-netbsd
* aarch64-linux-android
* arm-linux-androideabi
* armv7-linux-androideabi
* i686-linux-android (requires Rust >= 1.18)
* x86_64-linux-android (requires Rust >= 1.18)

Tier 3:
* aarch64-apple-ios
* aarch64-linux-android
* arm-linux-androideabi
* armv7-apple-ios
* armv7-linux-androideabi
* armv7s-apple-ios
* i386-apple-ios
* i686-linux-android
* x86_64-apple-ios
* x86_64-linux-android

## Usage

Expand Down

0 comments on commit f8a6951

Please sign in to comment.