From bb2b57caaf34850d71d82155c4e9c33f09db318e Mon Sep 17 00:00:00 2001
From: Marco A L Barbosa <malbarbo@gmail.com>
Date: Thu, 27 Apr 2017 09:15:41 -0300
Subject: [PATCH] Add x86_64-linux-android build support

---
 ci/docker/android/Dockerfile | 9 ++++++++-
 ci/run-docker.sh             | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ci/docker/android/Dockerfile b/ci/docker/android/Dockerfile
index 5c54ad47cfb..1e485412e2f 100644
--- a/ci/docker/android/Dockerfile
+++ b/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
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index a6944f9142b..67b80b8a5c0 100644
--- a/ci/run-docker.sh
+++ b/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