@@ -5,7 +5,7 @@ LABEL Description="This image provides a base Android development environment fo
5
5
ENV DEBIAN_FRONTEND=noninteractive
6
6
7
7
# set default build arguments
8
- ARG SDK_VERSION=commandlinetools-linux-6609375_latest .zip
8
+ ARG SDK_VERSION=commandlinetools-linux-7302050_latest .zip
9
9
ARG ANDROID_BUILD_VERSION=30
10
10
ARG ANDROID_TOOLS_VERSION=30.0.3
11
11
ARG BUCK_VERSION=2020.10.21.01
@@ -20,7 +20,7 @@ ENV ANDROID_SDK_HOME=${ANDROID_HOME}
20
20
ENV ANDROID_NDK=${ANDROID_HOME}/ndk/$NDK_VERSION
21
21
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
22
22
23
- ENV PATH=${ANDROID_NDK}:${ANDROID_HOME}/cmdline-tools/tools /bin:${ANDROID_HOME}/emulator:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:/opt/buck/bin/:${PATH}
23
+ ENV PATH=${ANDROID_NDK}:${ANDROID_HOME}/cmdline-tools/latest /bin:${ANDROID_HOME}/emulator:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:/opt/buck/bin/:${PATH}
24
24
25
25
# Install system dependencies
26
26
RUN apt update -qq && apt install -qq -y --no-install-recommends \
@@ -67,13 +67,14 @@ RUN curl -sS -L https://github.com/facebook/buck/releases/download/v${BUCK_VERSI
67
67
RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk.zip \
68
68
&& mkdir -p ${ANDROID_HOME}/cmdline-tools \
69
69
&& unzip -q -d ${ANDROID_HOME}/cmdline-tools /tmp/sdk.zip \
70
+ && mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
70
71
&& rm /tmp/sdk.zip \
71
72
&& yes | sdkmanager --licenses \
72
73
&& yes | sdkmanager "platform-tools" \
73
74
"emulator" \
74
75
"platforms;android-$ANDROID_BUILD_VERSION" \
75
76
"build-tools;$ANDROID_TOOLS_VERSION" \
76
- "cmake;3.10.2.4988404 " \
77
+ "cmake;3.18.1 " \
77
78
"system-images;android-21;google_apis;armeabi-v7a" \
78
79
"ndk;$NDK_VERSION" \
79
80
&& rm -rf ${ANDROID_HOME}/.android
0 commit comments