From 341b31e8f01271477f7a12f7b8a665abf4b5a3d6 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Fri, 9 Oct 2020 16:14:16 +0900
Subject: [PATCH] Tweak Dockerfile to fix android CI

---
 ci/docker/aarch64-linux-android/Dockerfile | 11 +++++------
 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 776a2509..98da29df 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 5678f4f1..c88ceebe 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/
-- 
GitLab