From aa8e567fd77bff80e68c3a2ec39586edaab466c0 Mon Sep 17 00:00:00 2001 From: Andrew Killer Date: Mon, 23 Mar 2020 12:50:02 +0000 Subject: [PATCH] We don't need to install the platform tools. --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f36d62..5e7f613 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,6 @@ ARG DEBIAN_FRONTEND=noninteractive ARG CMAKE_VERSION=3.10.2.4988404 ARG NDK_VERSION=21.0.6113669 ARG SDK_VERSION=6200805 -ARG ANDROID_API_LEVEL=29 WORKDIR /build @@ -39,7 +38,7 @@ ENV ANDROID_NDK_HOME=/opt/android-sdk/ndk/${NDK_VERSION} RUN wget -q "https://dl.google.com/android/repository/commandlinetools-linux-${SDK_VERSION}_latest.zip" -P /tmp && \ unzip -q -d /opt/android-sdk /tmp/commandlinetools-linux-${SDK_VERSION}_latest.zip && \ yes Y | ${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} --licenses >/dev/null && \ - yes Y | ${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} --install "platform-tools" "platforms;android-${ANDROID_API_LEVEL}" "ndk;${NDK_VERSION}" "cmake;${CMAKE_VERSION}" && \ + yes Y | ${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} --install "ndk;${NDK_VERSION}" "cmake;${CMAKE_VERSION}" && \ rm /tmp/commandlinetools-*.zip COPY scripts ./scripts