Auto merge of #1086 - malbarbo:android-x86_64, r=brson

Add x86_64-linux-android target

.travis.yml

@@ -91,6 +91,10 @@ matrix:
       env: TARGET=i686-linux-android
            DOCKER=android
            SKIP_TESTS=1
+    - os: linux
+      env: TARGET=x86_64-linux-android
+           DOCKER=android
+           SKIP_TESTS=1
 
     # On OSX we want to target 10.7 so we ensure that the appropriate
     # environment variable is set to tell the linker what we want.
@@ -122,7 +126,7 @@ install:
   - sudo pip install awscli
   - aws configure set preview.cloudfront true
   - curl https://static.rust-lang.org/rustup.sh |
-    sh -s -- --prefix=$HOME/rust --spec=nightly-2016-11-06 --with-target=$TARGET
+    sh -s -- --prefix=$HOME/rust --spec=nightly-2017-04-25 --with-target=$TARGET
 
 script:
   - mkdir -p target/$TARGET

README.md

@@ -532,6 +532,7 @@ platform of your choice:
 - [i686-linux-android](https://static.rust-lang.org/rustup/dist/i686-linux-android/rustup-init)
 - [i686-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/i686-unknown-linux-gnu/rustup-init)
 - [x86_64-apple-darwin](https://static.rust-lang.org/rustup/dist/x86_64-apple-darwin/rustup-init)
+- [x86_64-linux-android](https://static.rust-lang.org/rustup/dist/x86_64-linux-android/rustup-init)
 - [x86_64-pc-windows-gnu](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-gnu/rustup-init.exe)
 - [x86_64-pc-windows-msvc](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe)<sup>[†](#vs2015)</sup>
 - [x86_64-unknown-freebsd](https://static.rust-lang.org/rustup/dist/x86_64-unknown-freebsd/rustup-init)

appveyor.yml

@@ -44,7 +44,7 @@ install:
 
   # Install rust, x86_64-pc-windows-msvc host
   - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-toolchain=nightly-2017-01-06-x86_64-pc-windows-msvc
+  - rustup-init.exe -y --default-toolchain=nightly-2017-04-25-x86_64-pc-windows-msvc
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
 
   # Install the target we're compiling for

ci/docker/android/Dockerfile

@@ -27,9 +27,16 @@ RUN apt-get install -y --no-install-recommends \
         --install-dir /android-ndk/x86 \
         --arch x86 \
         --api 21 && \
+    ./android-ndk-r13b/build/tools/make_standalone_toolchain.py \
+        --install-dir /android-ndk/x86_64 \
+        --arch x86_64 \
+        --api 21 && \
     rm -rf ./android-ndk-r13b-linux-x86_64.zip ./android-ndk-r13b && \
     apt-get purge --auto-remove -y unzip python
 
-ENV PATH=$PATH:/android-ndk/arm/bin:/android-ndk/arm64/bin:/android-ndk/x86/bin
+ENV PATH=$PATH:/android-ndk/arm/bin
+ENV PATH=$PATH:/android-ndk/arm64/bin
+ENV PATH=$PATH:/android-ndk/x86/bin
+ENV PATH=$PATH:/android-ndk/x86_64/bin
 
 WORKDIR /buildslave

ci/run-docker.sh

@@ -67,6 +67,13 @@ case $TARGET in
     OPENSSL_OS=android-x86
     OPENSSL_CC=i686-linux-android-gcc
     OPENSSL_AR=i686-linux-android-ar
+    OPENSSL_CFLAGS=no-asm
+    ;;
+  x86_64-linux-android)
+    OPENSSL_OS=linux-x86_64
+    OPENSSL_CC=x86_64-linux-android-gcc
+    OPENSSL_AR=x86_64-linux-android-ar
+    OPENSSL_CFLAGS="no-asm -mandroid -fomit-frame-pointer"
     ;;
   arm-*-linux-gnueabi)
     OPENSSL_OS=linux-armv4

src/rustup-dist/src/dist.rs

@@ -166,6 +166,7 @@ impl TargetTriple {
                 (_, b"armv8l") if cfg!(target_os = "android") => Some("armv7-linux-androideabi"),
                 (_, b"aarch64") if cfg!(target_os = "android") => Some("aarch64-linux-android"),
                 (_, b"i686") if cfg!(target_os = "android") => Some("i686-linux-android"),
+                (_, b"x86_64") if cfg!(target_os = "android") => Some("x86_64-linux-android"),
                 (b"Linux", b"x86_64") => Some("x86_64-unknown-linux-gnu"),
                 (b"Linux", b"i686") => Some("i686-unknown-linux-gnu"),
                 (b"Linux", b"mips") => Some(TRIPLE_MIPS_UNKNOWN_LINUX_GNU),