@@ -7,16 +7,16 @@ ENV DEBIAN_FRONTEND=noninteractive
77# set default build arguments
88ARG SDK_VERSION=commandlinetools-linux-7302050_latest.zip
99ARG ANDROID_BUILD_VERSION=30
10- ARG ANDROID_TOOLS_VERSION=30.0.3
10+ ARG ANDROID_TOOLS_VERSION=30.0.2
1111ARG BUCK_VERSION=2020.10.21.01
12- ARG NDK_VERSION=20.1.5948944
12+ ARG NDK_VERSION=21.4.7075529
1313ARG NODE_VERSION=14.x
1414ARG WATCHMAN_VERSION=4.9.0
1515
1616# set default environment variables
1717ENV ADB_INSTALL_TIMEOUT=10
1818ENV ANDROID_HOME=/opt/android
19- ENV ANDROID_SDK_HOME =${ANDROID_HOME}
19+ ENV ANDROID_SDK_ROOT =${ANDROID_HOME}
2020ENV ANDROID_NDK=${ANDROID_HOME}/ndk/$NDK_VERSION
2121ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
2222
@@ -37,6 +37,7 @@ RUN apt update -qq && apt install -qq -y --no-install-recommends \
3737 make \
3838 openjdk-8-jdk-headless \
3939 openssh-client \
40+ patch \
4041 python3 \
4142 python3-distutils \
4243 rsync \
@@ -64,6 +65,7 @@ RUN curl -sS -L https://github.com/facebook/buck/releases/download/v${BUCK_VERSI
6465
6566# Full reference at https://dl.google.com/android/repository/repository2-1.xml
6667# download and unpack android
68+ # workaround buck clang version detection by symlinking
6769RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk.zip \
6870 && mkdir -p ${ANDROID_HOME}/cmdline-tools \
6971 && 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
7779 "cmake;3.18.1" \
7880 "system-images;android-21;google_apis;armeabi-v7a" \
7981 "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