Aight, let's try running everything on travis

.travis.yml

@@ -1,11 +1,20 @@
 language: rust
 sudo: required
-services:
-  - docker
-android:
-  components:
-    - android-19
 rust:
   - 1.0.0
+  - beta
+  - stable
+services:
+  - docker
 script:
-  - arm-linux-androideabi-gcc
+  - sh ci/run-travis.sh
+os:
+  - linux
+  - osx
+env:
+  - ARCH=i686
+  - ARCH=x86_64
+matrix:
+  include:
+    - os: linux
+      TARGET: arm-linux-androideabi

ci/run-travis.sh

@@ -0,0 +1,28 @@
+set -ex
+
+if [ "$TRAVIS_OS_NAME" = "linux"]; then
+  OS=unknown-linux-gnu
+else
+  OS=apple-darwin
+fi
+
+export HOST=$ARCH-$OS
+
+if [ "$TARGET" = "" ]; then
+  # Download and install the relevant target locally, then run tests
+  curl -sO https://static.rust-lang.org/dist/rust-$TRAVIS_RUST_VERSION-$HOST.tar.gz
+  tar xf rust-$TRAVIS_RUST_VERSION-$HOST.tar.gz
+  rm -rf $HOME/rust/lib/rustlib/$HOST
+  mv rust-$TRAVIS_RUST_VERSION-$HOST/rustc/lib/rustlib/$HOST \
+     $HOME/rust/lib/rustlib
+  sh ci/run.sh $HOST
+
+elif [ "$TARGET" = "arm-linux-androideabi" ]; then
+  # Pull a pre-built docker image for testing android, then run tests entirely
+  # within that image.
+  docker pull alexcrichton/rust-libc-test
+  docker run -v `pwd`:/clone -t alexcrichton/rust-libc-test sh ci/run.sh $TARGET
+else
+  echo "Unknown target: $TARGET"
+  exit 1
+fi