From 0dae0be4b4f539f2e7950ae5d65706349375db86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Fri, 24 May 2019 19:39:54 +0200
Subject: [PATCH] added x86_64 build target on android

---
 .cargo/config      |  4 ++++
 .travis.yml        |  3 ++-
 compile-android.sh | 10 ++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index 80b5bc39..36e02203 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -9,3 +9,7 @@ linker = './NDK/arm/bin/arm-linux-androideabi-clang'
 [target.i686-linux-android]
 ar = './NDK/x86/bin/i686-linux-android-ar'
 linker = './NDK/x86/bin/i686-linux-android-clang'
+
+[target.x86_64-linux-android]
+ar = './NDK/x86_64/bin/x86_64-linux-android-ar'
+linker = './NDK/x86_64/bin/x86_64-linux-android-clang'
diff --git a/.travis.yml b/.travis.yml
index e4451919..1d22a137 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,8 @@ before_install:
       ${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py --api 26 --arch arm64 --install-dir "${ANDROID_NDK_HOME}/arm64";
       ${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir "${ANDROID_NDK_HOME}/arm";
       ${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py --api 26 --arch x86 --install-dir "${ANDROID_NDK_HOME}/x86";
-      rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android;
+      ${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py --api 26 --arch x86_64 --install-dir "${ANDROID_NDK_HOME}/x86_64";
+      rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android;
     fi
 
 install:
diff --git a/compile-android.sh b/compile-android.sh
index 25cf57f7..3b88d079 100755
--- a/compile-android.sh
+++ b/compile-android.sh
@@ -8,13 +8,19 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
     exit 1
 fi
 
-# Ring won't build in the below target for whatever reason
-# 'arm armv7-linux-androideabi' \
+if [ $RELEASE ]; then
+    echo "Building in release mode... (slow)";
+else
+    echo "Building in debug mode... (fast)"
+fi
 
 ORIG_PATH="$PATH"
 
+# Ring won't build in the below target for whatever reason
+# 'arm armv7-linux-androideabi' \
 for archtargetstr in \
     'x86 i686-linux-android' \
+    'x86_64 x86_64-linux-android' \
     'arm64 aarch64-linux-android' \
 ; do
     arch=$(echo $archtargetstr | cut -d " " -f 1)