From e1c6dedf6234154db8e576bc352b81be3a6fb623 Mon Sep 17 00:00:00 2001
From: Marco A L Barbosa <malbarbo@gmail.com>
Date: Wed, 19 Apr 2017 11:03:19 -0300
Subject: [PATCH] Add test support for x86_64-linux-android
---
ci/android-install-sdk.sh | 4 +++
ci/docker/x86_64-linux-android/Dockerfile | 32 +++++++++++++++++++++++
ci/run.sh | 2 +-
3 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 ci/docker/x86_64-linux-android/Dockerfile
diff --git a/ci/android-install-sdk.sh b/ci/android-install-sdk.sh
index 0762dcb4..d03b7623 100644
--- a/ci/android-install-sdk.sh
+++ b/ci/android-install-sdk.sh
@@ -37,6 +37,10 @@ case "$1" in
abi=x86
;;
+ x86_64)
+ abi=x86_64
+ ;;
+
*)
echo "invalid arch: $1"
exit 1
diff --git a/ci/docker/x86_64-linux-android/Dockerfile b/ci/docker/x86_64-linux-android/Dockerfile
new file mode 100644
index 00000000..bf4793e0
--- /dev/null
+++ b/ci/docker/x86_64-linux-android/Dockerfile
@@ -0,0 +1,32 @@
+FROM ubuntu:16.04
+
+RUN dpkg --add-architecture i386 && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ file \
+ curl \
+ ca-certificates \
+ python \
+ unzip \
+ expect \
+ openjdk-9-jre \
+ libstdc++6:i386 \
+ libpulse0 \
+ gcc \
+ libc6-dev
+
+WORKDIR /android/
+COPY android* /android/
+
+ENV ANDROID_ARCH=x86_64
+ENV PATH=$PATH:/android/ndk-$ANDROID_ARCH/bin:/android/sdk/tools:/android/sdk/platform-tools
+
+RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
+RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
+RUN mv /root/.android /tmp
+RUN chmod 777 -R /tmp/.android
+RUN chmod 755 /android/sdk/tools/* /android/sdk/tools/qemu/linux-x86_64/*
+
+ENV PATH=$PATH:/rust/bin \
+ CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
+ HOME=/tmp
diff --git a/ci/run.sh b/ci/run.sh
index f854eb6f..4b8825f8 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -105,7 +105,7 @@ case "$TARGET" in
esac
case "$TARGET" in
- arm-linux-androideabi | aarch64-linux-android | i686-linux-android)
+ arm-linux-androideabi | aarch64-linux-android | i686-linux-android | x86_64-linux-android)
# set SHELL so android can detect a 64bits system, see
# http://stackoverflow.com/a/41789144
# https://issues.jenkins-ci.org/browse/JENKINS-26930?focusedCommentId=230791&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-230791
--
GitLab