Make Android a Tier 2 target

nix-rust · Jul 4, 2017 · 55bec60 · 55bec60
1 parent 5b7eda8
commit 55bec60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git 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
@@ -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