diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-10-09 18:07:15 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-09 18:07:15 +0900 |
| commit | dd8651682bf9a071bf4ee18b6db4a3fe7a664fe2 (patch) | |
| tree | 79c0c610a317c5a15bd7221b8dbfd4e49d725156 | |
| parent | a410c35f11e93248ebff0b3e127808ec4cfc65b7 (diff) | |
| parent | 341b31e8f01271477f7a12f7b8a665abf4b5a3d6 (diff) | |
| download | rust-libc-dd8651682bf9a071bf4ee18b6db4a3fe7a664fe2.tar.gz | |
Merge pull request #1917 from JohnTitor/arm-android
Fix {aarch64,arm}-android targets' CI
| -rw-r--r-- | ci/docker/aarch64-linux-android/Dockerfile | 11 | ||||
| -rw-r--r-- | ci/docker/arm-linux-androideabi/Dockerfile | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile index 776a2509c1..98da29df01 100644 --- a/ci/docker/aarch64-linux-android/Dockerfile +++ b/ci/docker/aarch64-linux-android/Dockerfile @@ -1,8 +1,9 @@ FROM ubuntu:20.04 -RUN dpkg --add-architecture i386 && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ +RUN dpkg --add-architecture i386 +RUN apt-get update +RUN apt-get install -y --no-install-recommends libc6-dev gcc +RUN apt-get install -y --no-install-recommends \ file \ curl \ ca-certificates \ @@ -12,9 +13,7 @@ RUN dpkg --add-architecture i386 && \ expect \ openjdk-8-jre \ libstdc++6:i386 \ - libpulse0 \ - gcc \ - libc6-dev + libpulse0 WORKDIR /android/ COPY android* /android/ diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile index 5678f4f1a6..c88ceebe07 100644 --- a/ci/docker/arm-linux-androideabi/Dockerfile +++ b/ci/docker/arm-linux-androideabi/Dockerfile @@ -1,8 +1,9 @@ FROM ubuntu:20.04 -RUN dpkg --add-architecture i386 && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ +RUN dpkg --add-architecture i386 +RUN apt-get update +RUN apt-get install -y --no-install-recommends libc6-dev gcc +RUN apt-get install -y --no-install-recommends \ file \ curl \ ca-certificates \ @@ -12,9 +13,7 @@ RUN dpkg --add-architecture i386 && \ expect \ openjdk-8-jre \ libstdc++6:i386 \ - libpulse0 \ - gcc \ - libc6-dev + libpulse0 WORKDIR /android/ COPY android* /android/ |