diff --git a/Dockerfile b/Dockerfile index 6673aff9a..efe952694 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,14 +14,23 @@ ENV ANDROID_SDK_URL https://dl.google.com/android/${ANDROID_SDK_FILENAME} ENV ANDROID_API_LEVELS android-28 ENV ANDROID_BUILD_TOOLS_VERSION 28.0.3 ENV ANDROID_HOME /usr/local/android-sdk-linux +ENV ANDROID_NDK_HOME /opt/android-ndk +ENV ANDROID_NDK_VERSION r20 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools ENV SRC /src -RUN cd /usr/local/ && \ - wget -q ${ANDROID_SDK_URL} && \ - tar -xzf ${ANDROID_SDK_FILENAME} && \ - rm ${ANDROID_SDK_FILENAME} -RUN echo y | android update sdk --no-ui -a --filter ${ANDROID_API_LEVELS} -RUN echo y | android update sdk --no-ui -a --filter extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository -RUN echo y | android update sdk --no-ui -a --filter tools,platform-tools,build-tools-${ANDROID_BUILD_TOOLS_VERSION} -RUN rm -rf ${ANDROID_HOME}/tools +RUN cd /usr/local/ \ + && wget -q ${ANDROID_SDK_URL} \ + && tar -xzf ${ANDROID_SDK_FILENAME} \ + && rm ${ANDROID_SDK_FILENAME} \ + && echo y | android update sdk --no-ui -a --filter ${ANDROID_API_LEVELS} \ + && echo y | android update sdk --no-ui -a --filter extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository \ + && echo y | android update sdk --no-ui -a --filter tools,platform-tools,build-tools-${ANDROID_BUILD_TOOLS_VERSION} \ + && rm -rf ${ANDROID_HOME}/tools \ + && mkdir /opt/android-ndk-tmp \ + && cd /opt/android-ndk-tmp \ + && wget -q https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip \ + && unzip -q android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip \ + && mv ./android-ndk-${ANDROID_NDK_VERSION} ${ANDROID_NDK_HOME} \ + && cd ${ANDROID_NDK_HOME} \ + && rm -rf /opt/android-ndk-tmp WORKDIR ${SRC}