Update android ndk to r25b and api to 33

This commit is contained in:
Jonas Vautherin 2022-09-01 19:29:57 +02:00 committed by Jonas Vautherin
parent 94a5003362
commit e88a3ceab3
4 changed files with 12 additions and 12 deletions

View File

@ -16,8 +16,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
CXX=${CROSS_ROOT}/bin/clang++ \ CXX=${CROSS_ROOT}/bin/clang++ \
LD=${CROSS_ROOT}/bin/ld LD=${CROSS_ROOT}/bin/ld
ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_REVISION 25b
ENV ANDROID_NDK_API 23 ENV ANDROID_API 33
RUN mkdir -p /build && \ RUN mkdir -p /build && \
cd /build && \ cd /build && \
@ -26,7 +26,7 @@ RUN mkdir -p /build && \
cd android-ndk-r${ANDROID_NDK_REVISION} && \ cd android-ndk-r${ANDROID_NDK_REVISION} && \
./build/tools/make_standalone_toolchain.py \ ./build/tools/make_standalone_toolchain.py \
--arch arm \ --arch arm \
--api ${ANDROID_NDK_API} \ --api ${ANDROID_API} \
--stl=libc++ \ --stl=libc++ \
--install-dir=${CROSS_ROOT} && \ --install-dir=${CROSS_ROOT} && \
cd / && \ cd / && \

View File

@ -20,8 +20,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
CXX=${CROSS_ROOT}/bin/clang++ \ CXX=${CROSS_ROOT}/bin/clang++ \
LD=${CROSS_ROOT}/bin/ld LD=${CROSS_ROOT}/bin/ld
ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_REVISION 25b
ENV ANDROID_NDK_API 23 ENV ANDROID_API 33
RUN mkdir -p /build && \ RUN mkdir -p /build && \
cd /build && \ cd /build && \
@ -30,7 +30,7 @@ RUN mkdir -p /build && \
cd android-ndk-r${ANDROID_NDK_REVISION} && \ cd android-ndk-r${ANDROID_NDK_REVISION} && \
./build/tools/make_standalone_toolchain.py \ ./build/tools/make_standalone_toolchain.py \
--arch arm64 \ --arch arm64 \
--api ${ANDROID_NDK_API} \ --api ${ANDROID_API} \
--stl=libc++ \ --stl=libc++ \
--install-dir=${CROSS_ROOT} && \ --install-dir=${CROSS_ROOT} && \
cd / && \ cd / && \

View File

@ -11,8 +11,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
CXX=${CROSS_ROOT}/bin/clang++ \ CXX=${CROSS_ROOT}/bin/clang++ \
LD=${CROSS_ROOT}/bin/ld LD=${CROSS_ROOT}/bin/ld
ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_REVISION 25b
ENV ANDROID_NDK_API 23 ENV ANDROID_API 33
RUN mkdir -p /build && \ RUN mkdir -p /build && \
cd /build && \ cd /build && \
@ -21,7 +21,7 @@ RUN mkdir -p /build && \
cd android-ndk-r${ANDROID_NDK_REVISION} && \ cd android-ndk-r${ANDROID_NDK_REVISION} && \
./build/tools/make_standalone_toolchain.py \ ./build/tools/make_standalone_toolchain.py \
--arch x86 \ --arch x86 \
--api ${ANDROID_NDK_API} \ --api ${ANDROID_API} \
--stl=libc++ \ --stl=libc++ \
--install-dir=${CROSS_ROOT} && \ --install-dir=${CROSS_ROOT} && \
cd / && \ cd / && \

View File

@ -11,8 +11,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
CXX=${CROSS_ROOT}/bin/clang++ \ CXX=${CROSS_ROOT}/bin/clang++ \
LD=${CROSS_ROOT}/bin/ld LD=${CROSS_ROOT}/bin/ld
ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_REVISION 25b
ENV ANDROID_NDK_API 23 ENV ANDROID_API 33
RUN mkdir -p /build && \ RUN mkdir -p /build && \
cd /build && \ cd /build && \
@ -21,7 +21,7 @@ RUN mkdir -p /build && \
cd android-ndk-r${ANDROID_NDK_REVISION} && \ cd android-ndk-r${ANDROID_NDK_REVISION} && \
./build/tools/make_standalone_toolchain.py \ ./build/tools/make_standalone_toolchain.py \
--arch x86_64 \ --arch x86_64 \
--api ${ANDROID_NDK_API} \ --api ${ANDROID_API} \
--stl=libc++ \ --stl=libc++ \
--install-dir=${CROSS_ROOT} && \ --install-dir=${CROSS_ROOT} && \
cd / && \ cd / && \