Use the standard android slave docker image

Author: alexcrichton

ci/Dockerfile-android

@@ -8,21 +8,6 @@ this project.
 
 First up, let's talk about the files in this directory:
 
-* `Dockerfile-android`, `android-accept-licenses.sh` -- these two files are
-  used to build the Docker image that the android CI builder uses. The
-  `Dockerfile` just installs the Android SDK, NDK, a Rust nightly, Rust target
-  libraries for Android, and sets up an emulator to run tests in. You can build
-  a new image with this command (from the root of the project):
-
-      docker build -t alexcrichton/rust-libc-test -f ci/Dockerfile-android .
-
-  When building a new image contact @alexcrichton to push it to the docker hub
-  and have libc start using it. This hasn't needed to happen yet, so the process
-  may be a little involved.
-
-  The script here, `android-accept-licenses.sh` is just a helper used to accept
-  the licenses of the SDK of Android while the docker image is being created.
-
 * `msys2.ps1` - a PowerShell script which is used to install MSYS2 on the
   AppVeyor bots. As of this writing MSYS2 isn't installed by default, and this
   script will install the right version/arch of msys2 in preparation of using
@@ -67,16 +52,17 @@ builds are run on stable/beta/nightly, but are the only ones that do so.
 
 The remaining architectures look like:
 
-* Android runs in a docker image with an emulator, the NDK, and the SDK already
-  set up (see `Dockerfile-android`). The entire build happens within the docker
-  image.
+* Android runs in a [docker image][android-docker] with an emulator, the NDK,
+  and the SDK already set up. The entire build happens within the docker image.
 * The MIPS, ARM, and AArch64 builds all use QEMU to run the generated binary to
   actually verify the tests pass.
 * The MUSL build just has to download a MUSL compiler and target libraries and
   then otherwise runs tests normally.
 * iOS builds need an extra linker flag currently, but beyond that they're built
   as standard as everything else.
 
+[android-docker]: https://github.com/rust-lang/rust-buildbot/blob/master/slaves/android/Dockerfile
+
 Hopefully that's at least somewhat of an introduction to everything going on
 here, and feel free to ping @alexcrichton with questions!
 

ci/README.md

@@ -46,11 +46,23 @@ esac
 
 case "$TARGET" in
   # Pull a pre-built docker image for testing android, then run tests entirely
-  #d within that image.
+  # within that image. Note that this is using the same rustc installation that
+  # travis has (sharing it via `-v`) and otherwise the tests run entirely within
+  # the container.
   arm-linux-androideabi)
-    docker pull alexcrichton/rust-libc-test
-    exec docker run -v `pwd`:/clone -t alexcrichton/rust-libc-test \
-      sh ci/run.sh $TARGET
+    script="
+cp -r /checkout/* .
+mkdir .cargo
+cp ci/cargo-config .cargo/config
+sh ci/run.sh $TARGET
+"
+    exec docker run \
+      --entrypoint bash \
+      -v $HOME/rust:/usr/local:ro \
+      -v `pwd`:/checkout:ro \
+      -e LD_LIBRARY_PATH=/usr/local/lib \
+      -it alexcrichton/rust-slave-android:2015-10-21 \
+      -c "$script"
     ;;
 
   x86_64-unknown-linux-musl)

ci/android-accept-licenses.sh

@@ -19,9 +19,9 @@ esac
 
 case "$TARGET" in
   arm-linux-androideabi)
-    emulator @test -no-window &
+    emulator @arm-18 -no-window &
     adb wait-for-device
-    adb push /root/target/$TARGET/debug/libc-test /data/libc-test
+    adb push libc-test/target/$TARGET/debug/libc-test /data/libc-test
     adb shell /data/libc-test
     ;;
 

ci/run-travis.sh

@@ -200,7 +200,7 @@ extern {
                  flags: ::c_int) -> ::c_int;
     pub fn mprotect(addr: *const ::c_void, len: ::size_t, prot: ::c_int)
                     -> ::c_int;
-    pub fn sysconf(name: ::c_int) -> ::c_int;
+    pub fn sysconf(name: ::c_int) -> ::c_long;
     pub fn usleep(secs: ::c_ulong) -> ::c_int;
     pub fn recvfrom(socket: ::c_int, buf: *mut ::c_void, len: ::size_t,
                     flags: ::c_uint, addr: *const ::sockaddr,