diff --git a/android/Dockerfile b/android/Dockerfile index b16b1f5..4113702 100644 --- a/android/Dockerfile +++ b/android/Dockerfile @@ -2,10 +2,10 @@ ARG DOCKER_PREFIX=wapmobil/ FROM ${DOCKER_PREFIX}debian-base ARG JOBS_COUNT=4 -ARG QT_DOWNLOAD_SERVER=shstk.ru/files +ARG QT_DOWNLOAD_SERVER=https://shstk.ru/files -ENV CUR_SODIUM_VERSION=1.0.18 -ENV CUR_FFTW_VERSION=3.3.8 +ENV CUR_SODIUM_VERSION=1.0.21 +ENV CUR_FFTW_VERSION=3.3.10 ENV CUR_QT_VERSION_MAJOR=5.14 ENV CUR_QT_VERSION=5.14.1 @@ -13,10 +13,10 @@ ENV CUR_QT_VERSION=5.14.1 # dev soft for our SDK RUN mkdir -p /usr/share/man/man1 && apt-get update \ && apt-get install -y cpio libglu1-mesa-dev libgl1-mesa-dev libwayland-dev libncurses-dev flex bison gperf \ - python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools \ + python3 python3-pip python3-setuptools python3-serial python3-click python3-cryptography python3-pyparsing python3-pyelftools \ ccache libffi-dev libssl-dev doxygen graphviz libx11-dev libxkbcommon-dev libpkgconfig-perl libfreetype6-dev libfontconfig1-dev \ - lzma-dev liblzma-dev libxml2-dev libbz2-dev libmpc-dev libmpfr-dev libgmp-dev libicu-dev libusb-1.0-0-dev libreadline-dev \ - build-essential android-sdk openjdk-11-jdk && rm -rf /var/cache/apt/archives/* + liblzma-dev libxml2-dev libbz2-dev libmpc-dev libmpfr-dev libgmp-dev libicu-dev libusb-1.0-0-dev libreadline-dev \ + build-essential android-sdk openjdk-25-jdk && rm -rf /var/cache/apt/archives/* # Android SDK and NDK @@ -25,13 +25,14 @@ WORKDIR /soft/android ENV ANDROID_HOME=/usr/lib/android-sdk ENV ANDROID_NDK_HOME=${ANDROID_HOME}/ndk-bundle ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake +ENV CMDLINE_TOOLS=${ANDROID_HOME}/cmdline-tools ENV NDK_PLATFORM="android-21" -RUN wget -nv -O commandlinetools.zip https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip?hl=ru \ +RUN wget -nv -O commandlinetools.zip https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip \ && unzip -o commandlinetools.zip -d ${ANDROID_HOME} && rm -f commandlinetools.zip -RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} --licenses -RUN ${ANDROID_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} --update -RUN ${ANDROID_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-21" "platforms;android-29" "platforms;android-30" "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" "platforms;android-35" "ndk-bundle" "build-tools;28.0.3" "platform-tools" "tools" +RUN yes | ${CMDLINE_TOOLS}/bin/sdkmanager --sdk_root=${ANDROID_HOME} --licenses +RUN ${CMDLINE_TOOLS}/bin/sdkmanager --sdk_root=${ANDROID_HOME} --update +RUN ${CMDLINE_TOOLS}/bin/sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-21" "platforms;android-29" "platforms;android-30" "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" "platforms;android-35" "ndk-bundle" "build-tools;29.0.3" "platform-tools" "tools" COPY android.toolchain.cmake.add /soft/android/ RUN cat /soft/android/android.toolchain.cmake.add >> ${ANDROID_TOOLCHAIN} @@ -49,7 +50,7 @@ WORKDIR /soft/libsodium-${CUR_SODIUM_VERSION} RUN TARGET_ARCH=armv7-a \ CFLAGS="-O3 -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -marm -march=armv7-a" \ ARCH=arm \ - HOST_COMPILER=arm-linux-androideabi \ + HOST_COMPILER=armv7a-linux-androideabi \ dist-build/android-build.sh && \ cp -rfv /soft/libsodium-${CUR_SODIUM_VERSION}/libsodium-android-armv7-a/* /soft/android/armeabi-v7a/ && \ rm -rf /soft/libsodium-${CUR_SODIUM_VERSION}/libsodium-android-* && \ @@ -113,7 +114,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DENABLE_FLOAT=0 -DEN # Qt WORKDIR /soft/android -RUN wget -nv http://${QT_DOWNLOAD_SERVER}/qt-android-${CUR_QT_VERSION}.zip \ +RUN wget -nv ${QT_DOWNLOAD_SERVER}/qt-android-${CUR_QT_VERSION}.zip \ && unzip -o qt-android-${CUR_QT_VERSION}.zip -d /soft/android/qt \ && rm -f qt-android-${CUR_QT_VERSION}.zip WORKDIR /soft/android/qt/lib/cmake/Qt5