From 55bec60705686adb6abe87865d0111c4fcfbfb34 Mon Sep 17 00:00:00 2001 From: roblabla Date: Tue, 4 Jul 2017 01:07:21 +0200 Subject: [PATCH] Make Android a Tier 2 target --- .travis.yml | 16 ++-------------- README.md | 10 +++++----- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index a87dd3bb1d..592fbeda21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 diff --git a/README.md b/README.md index 3f51a51209..0d6ddf0967 100644 --- a/README.md +++ b/README.md @@ -68,18 +68,18 @@ Tier 1: Tier 2: * i686-unknown-freebsd * x86_64-unknown-netbsd + * aarch64-linux-android + * arm-linux-androideabi + * armv7-linux-androideabi + * i686-linux-android + * x86_64-linux-android 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