From 8b4ea6a596f6c706e346580fabdfe9cf0e378773 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Wed, 29 Jan 2020 10:44:18 -0600
Subject: [PATCH] Temporarily disable armv7-linux-androideabi on Travis CI.

Thigns are failing with an "Illegal instruction" error. I initially thought
it was specific to Rust 1.40 but it is now happening with Rust 1.39 too, so
I'm assuming something changed in the emulator or NDK, since the Android SDK
isn't locked in CI/CD yet.
---
 .travis.yml             | 66 -----------------------------------------
 mk/update-travis-yml.py |  2 +-
 2 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dbbe8ac24..cc312b054 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,28 +45,6 @@ matrix:
         - build-tools-26.0.2
       dist: trusty
 
-    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=stable
-      rust: stable
-      os: linux
-      language: android
-      android:
-        components:
-        - android-18
-        - build-tools-26.0.2
-        - sys-img-armeabi-v7a-android-18
-      dist: trusty
-
-    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=stable
-      rust: stable
-      os: linux
-      language: android
-      android:
-        components:
-        - android-18
-        - build-tools-26.0.2
-        - sys-img-armeabi-v7a-android-18
-      dist: trusty
-
     - env: TARGET_X=x86_64-unknown-linux-gnu  FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=stable
       rust: stable
       os: linux
@@ -261,28 +239,6 @@ matrix:
         - build-tools-26.0.2
       dist: trusty
 
-    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=nightly
-      rust: nightly
-      os: linux
-      language: android
-      android:
-        components:
-        - android-18
-        - build-tools-26.0.2
-        - sys-img-armeabi-v7a-android-18
-      dist: trusty
-
-    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=nightly
-      rust: nightly
-      os: linux
-      language: android
-      android:
-        components:
-        - android-18
-        - build-tools-26.0.2
-        - sys-img-armeabi-v7a-android-18
-      dist: trusty
-
     - env: TARGET_X=x86_64-unknown-linux-gnu  FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=nightly
       rust: nightly
       os: linux
@@ -492,28 +448,6 @@ matrix:
         - build-tools-26.0.2
       dist: trusty
 
-    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=beta
-      rust: beta
-      os: linux
-      language: android
-      android:
-        components:
-        - android-18
-        - build-tools-26.0.2
-        - sys-img-armeabi-v7a-android-18
-      dist: trusty
-
-    - env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=beta
-      rust: beta
-      os: linux
-      language: android
-      android:
-        components:
-        - android-18
-        - build-tools-26.0.2
-        - sys-img-armeabi-v7a-android-18
-      dist: trusty
-
     - env: TARGET_X=x86_64-unknown-linux-gnu  FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=beta
       rust: beta
       os: linux
diff --git a/mk/update-travis-yml.py b/mk/update-travis-yml.py
index 446848411..ea61e078e 100755
--- a/mk/update-travis-yml.py
+++ b/mk/update-travis-yml.py
@@ -73,7 +73,7 @@ targets = {
     ],
     "linux" : [
         "aarch64-linux-android",
-        "armv7-linux-androideabi",
+        # TODO: Emulator is broken "armv7-linux-androideabi",
         "x86_64-unknown-linux-gnu",
         "aarch64-unknown-linux-gnu",
         "i686-unknown-linux-gnu",