diff --git a/ci/android-install-sdk.sh b/ci/android-install-sdk.sh index 0762dcb45d0b710799b2efb8096320c3618ea47c..d03b7623bf78544bd9adf50162767b09a288bffa 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 0000000000000000000000000000000000000000..bf4793e0607fa2a2bdb4166acb9b398a85787b2a --- /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 f854eb6faaa80622f7bcd433b7437e0f4a325067..4b8825f8dfa3010174feaa84047a19c2ba671d63 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