@@ -7,16 +7,16 @@ ENV DEBIAN_FRONTEND=noninteractive
7
7
# set default build arguments
8
8
ARG SDK_VERSION=commandlinetools-linux-7302050_latest.zip
9
9
ARG ANDROID_BUILD_VERSION=30
10
- ARG ANDROID_TOOLS_VERSION=30.0.3
10
+ ARG ANDROID_TOOLS_VERSION=30.0.2
11
11
ARG BUCK_VERSION=2020.10.21.01
12
- ARG NDK_VERSION=20.1.5948944
12
+ ARG NDK_VERSION=21.4.7075529
13
13
ARG NODE_VERSION=14.x
14
14
ARG WATCHMAN_VERSION=4.9.0
15
15
16
16
# set default environment variables
17
17
ENV ADB_INSTALL_TIMEOUT=10
18
18
ENV ANDROID_HOME=/opt/android
19
- ENV ANDROID_SDK_HOME =${ANDROID_HOME}
19
+ ENV ANDROID_SDK_ROOT =${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
@@ -37,6 +37,7 @@ RUN apt update -qq && apt install -qq -y --no-install-recommends \
37
37
make \
38
38
openjdk-8-jdk-headless \
39
39
openssh-client \
40
+ patch \
40
41
python3 \
41
42
python3-distutils \
42
43
rsync \
@@ -64,6 +65,7 @@ RUN curl -sS -L https://github.com/facebook/buck/releases/download/v${BUCK_VERSI
64
65
65
66
# Full reference at https://dl.google.com/android/repository/repository2-1.xml
66
67
# download and unpack android
68
+ # workaround buck clang version detection by symlinking
67
69
RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk.zip \
68
70
&& mkdir -p ${ANDROID_HOME}/cmdline-tools \
69
71
&& unzip -q -d ${ANDROID_HOME}/cmdline-tools /tmp/sdk.zip \
@@ -77,4 +79,5 @@ RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk
77
79
"cmake;3.18.1" \
78
80
"system-images;android-21;google_apis;armeabi-v7a" \
79
81
"ndk;$NDK_VERSION" \
80
- && rm -rf ${ANDROID_HOME}/.android
82
+ && rm -rf ${ANDROID_HOME}/.android \
83
+ && ln -s ${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.9 ${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8
0 commit comments