Let's try android-9

Author: alexcrichton

master/master.cfg

@@ -865,7 +865,7 @@ class ConfigCommand(object):
         # Set up the path to the android NDK
         if testing_android:
             s += " --arm-linux-androideabi-ndk=/android/ndk-arm-9"
-            s += " --i686-linux-android-ndk=/android/ndk-x86"
+            s += " --i686-linux-android-ndk=/android/ndk-x86-9"
             s += " --aarch64-linux-android-ndk=/android/ndk-aarch64"
             s += " --disable-docs"
 

slaves/android/Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get -y update
 RUN apt-get -y install --force-yes \
         curl make git expect libncurses5:i386 libstdc++6:i386 zlib1g:i386 \
         python-dev python-pip stunnel \
-        g++-multilib openjdk-6-jre psmisc
+        g++-multilib openjdk-6-jre psmisc unzip
 
 # Install buildbot and prep it to run
 RUN pip install buildbot-slave

slaves/android/install-ndk.sh

@@ -8,9 +8,9 @@ set -ex
 curl -O http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
 unzip -q android-ndk-r11c-linux-x86_64.zip
 bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \
-        --platform=android-18 \
+        --platform=android-9 \
         --toolchain=arm-linux-androideabi-4.9 \
-        --install-dir=/android/ndk-arm-18 \
+        --install-dir=/android/ndk-arm-9 \
         --ndk-dir=/android/android-ndk-r11c \
         --arch=arm
 bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \
@@ -26,9 +26,9 @@ bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \
         --ndk-dir=/android/android-ndk-r11c \
         --arch=arm64
 bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \
-        --platform=android-21 \
+        --platform=android-9 \
         --toolchain=x86-4.9 \
-        --install-dir=/android/ndk-x86 \
+        --install-dir=/android/ndk-x86-9 \
         --ndk-dir=/android/android-ndk-r11c \
         --arch=x86
 bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \