monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-22 19:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Docker android: update Qt to 5.15.6 (and API level to 29)

Browse source
This commit is contained in:
malinero 2022-08-09 16:13:53 +02:00
parent 64a6ca7fc7
commit 1b119eb8f5
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile.android
View file

@ -5,12 +5,12 @@ ARG ANDROID_NDK_REVISION=21e
ARG ANDROID_NDK_HASH=c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9 ARG ANDROID_NDK_HASH=c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9
ARG ANDROID_SDK_REVISION=7302050_latest ARG ANDROID_SDK_REVISION=7302050_latest
ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622 ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622
ARG QT_VERSION=5.15.2 ARG QT_VERSION=v5.15.6-lts-lgpl
WORKDIR /opt/android WORKDIR /opt/android
ENV WORKDIR=/opt/android ENV WORKDIR=/opt/android
ENV ANDROID_NATIVE_API_LEVEL=28 ENV ANDROID_NATIVE_API_LEVEL=29
ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL} ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL}
ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang
ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++ ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++
@ -79,7 +79,6 @@ RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 \
-skip qtpurchasing \ -skip qtpurchasing \
-skip qtgamepad -skip qtscript -skip qtdoc \ -skip qtgamepad -skip qtscript -skip qtdoc \
-no-warnings-are-errors \ -no-warnings-are-errors \
&& sed -i '213,215d' qtbase/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h \
&& PATH=${HOST_PATH} make -j${THREADS} \ && PATH=${HOST_PATH} make -j${THREADS} \
&& PATH=${HOST_PATH} make -j${THREADS} install \ && PATH=${HOST_PATH} make -j${THREADS} install \
&& cd qttools/src/linguist/lrelease \ && cd qttools/src/linguist/lrelease \