Skip to content

Commit f8a6951

Browse files
committed
Make Android a Tier 2 target
1 parent 7c9c167 commit f8a6951

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

.travis.yml

+2-14
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ matrix:
2323
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
2424
rust: 1.13.0
2525
- env: TARGET=i686-linux-android DISABLE_TESTS=1
26-
rust: 1.13.0
26+
rust: 1.18.0
2727
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
28-
rust: 1.13.0
28+
rust: 1.18.0
2929

3030
# iOS
3131
- env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
@@ -104,18 +104,6 @@ matrix:
104104
rust: nightly
105105

106106
allow_failures:
107-
# Android (in the process of fixing these, so they're allowed to fail for now)
108-
- env: TARGET=aarch64-linux-android DISABLE_TESTS=1
109-
rust: 1.13.0
110-
- env: TARGET=arm-linux-androideabi DISABLE_TESTS=1
111-
rust: 1.13.0
112-
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
113-
rust: 1.13.0
114-
- env: TARGET=i686-linux-android DISABLE_TESTS=1
115-
rust: 1.13.0
116-
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
117-
rust: 1.13.0
118-
119107
# iOS is still being worked on, so for now don't block on compilation failures
120108
- env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
121109
rust: 1.13.0

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
3232
- Changed type signature of `sys::select::FdSet::contains` to make `self`
3333
immutable ([#564](https://github.com/nix-rust/nix/pull/564))
3434
- Changed type of `sched::sched_setaffinity`'s `pid` argument to `pid_t`
35+
- Promoted all Android targets to Tier 2 support
3536

3637
### Removed
3738
- Removed io::Error from nix::Error and conversion from nix::Error to Errno

README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ limitations. Support for platforms is split into two tiers:
4646
*do not* block the inclusion of new code. Testing may be run, but
4747
failures in tests don't block the inclusion of new code.
4848

49-
The following targets are all supported by nix on Rust 1.13.0 or newer:
49+
The following targets are all supported by nix on Rust 1.13.0 or newer (unless
50+
otherwise noted):
5051

5152
Tier 1:
5253
* i686-unknown-linux-gnu
@@ -68,18 +69,18 @@ Tier 1:
6869
Tier 2:
6970
* i686-unknown-freebsd
7071
* x86_64-unknown-netbsd
72+
* aarch64-linux-android
73+
* arm-linux-androideabi
74+
* armv7-linux-androideabi
75+
* i686-linux-android (requires Rust >= 1.18)
76+
* x86_64-linux-android (requires Rust >= 1.18)
7177

7278
Tier 3:
7379
* aarch64-apple-ios
74-
* aarch64-linux-android
75-
* arm-linux-androideabi
7680
* armv7-apple-ios
77-
* armv7-linux-androideabi
7881
* armv7s-apple-ios
7982
* i386-apple-ios
80-
* i686-linux-android
8183
* x86_64-apple-ios
82-
* x86_64-linux-android
8384

8485
## Usage
8586

0 commit comments

Comments
 (0)