Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-14 15:01:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #563 from bensuperpc/Update_android

Browse Source 
Update android NDK to r23 (August 2021)
This commit is contained in:
Bensuperpc 2021-08-22 11:30:02 +02:00 committed by GitHub
commit 9c713ea6b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android-arm/Dockerfile.in
View File

@ -17,12 +17,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
ENV ANDROID_NDK_REVISION 22b ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 22 ENV ANDROID_NDK_API 23
RUN mkdir -p /build && \ RUN mkdir -p /build && \
cd /build && \ cd /build && \
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
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 \

9
android-arm64/Dockerfile.in
View File

@ -21,12 +21,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
ENV ANDROID_NDK_REVISION 22b ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 22 ENV ANDROID_NDK_API 23
RUN mkdir -p /build && \ RUN mkdir -p /build && \
cd /build && \ cd /build && \
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
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 \

9
android-x86/Dockerfile
View File

@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
ENV ANDROID_NDK_REVISION 22b ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 22 ENV ANDROID_NDK_API 23
RUN mkdir -p /build && \ RUN mkdir -p /build && \
cd /build && \ cd /build && \
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
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 \

9
android-x86_64/Dockerfile
View File

@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
ENV ANDROID_NDK_REVISION 22b ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 22 ENV ANDROID_NDK_API 23
RUN mkdir -p /build && \ RUN mkdir -p /build && \
cd /build && \ cd /build && \
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \ unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
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 \