mirror of
				https://github.com/bensuperpc/dockcross.git
				synced 2025-11-04 01:46:24 +01:00 
			
		
		
		
	Merge pull request #563 from bensuperpc/Update_android
Update android NDK to r23 (August 2021)
This commit is contained in:
		@@ -17,12 +17,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
 | 
			
		||||
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
 | 
			
		||||
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 | 
			
		||||
 | 
			
		||||
ENV ANDROID_NDK_REVISION 22b
 | 
			
		||||
ENV ANDROID_NDK_API 22
 | 
			
		||||
ENV ANDROID_NDK_REVISION 23
 | 
			
		||||
ENV ANDROID_NDK_API 23
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /build && \
 | 
			
		||||
    cd /build && \
 | 
			
		||||
    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
 | 
			
		||||
    unzip ./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.zip && \
 | 
			
		||||
    cd android-ndk-r${ANDROID_NDK_REVISION} && \
 | 
			
		||||
    ./build/tools/make_standalone_toolchain.py \
 | 
			
		||||
      --arch arm \
 | 
			
		||||
 
 | 
			
		||||
@@ -21,12 +21,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
 | 
			
		||||
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
 | 
			
		||||
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 | 
			
		||||
 | 
			
		||||
ENV ANDROID_NDK_REVISION 22b
 | 
			
		||||
ENV ANDROID_NDK_API 22
 | 
			
		||||
ENV ANDROID_NDK_REVISION 23
 | 
			
		||||
ENV ANDROID_NDK_API 23
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /build && \
 | 
			
		||||
    cd /build && \
 | 
			
		||||
    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
 | 
			
		||||
    unzip ./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.zip && \
 | 
			
		||||
    cd android-ndk-r${ANDROID_NDK_REVISION} && \
 | 
			
		||||
    ./build/tools/make_standalone_toolchain.py \
 | 
			
		||||
      --arch arm64 \
 | 
			
		||||
 
 | 
			
		||||
@@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
 | 
			
		||||
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
 | 
			
		||||
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 | 
			
		||||
 | 
			
		||||
ENV ANDROID_NDK_REVISION 22b
 | 
			
		||||
ENV ANDROID_NDK_API 22
 | 
			
		||||
ENV ANDROID_NDK_REVISION 23
 | 
			
		||||
ENV ANDROID_NDK_API 23
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /build && \
 | 
			
		||||
    cd /build && \
 | 
			
		||||
    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
 | 
			
		||||
    unzip ./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.zip && \
 | 
			
		||||
    cd android-ndk-r${ANDROID_NDK_REVISION} && \
 | 
			
		||||
    ./build/tools/make_standalone_toolchain.py \
 | 
			
		||||
      --arch x86 \
 | 
			
		||||
 
 | 
			
		||||
@@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
 | 
			
		||||
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
 | 
			
		||||
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 | 
			
		||||
 | 
			
		||||
ENV ANDROID_NDK_REVISION 22b
 | 
			
		||||
ENV ANDROID_NDK_API 22
 | 
			
		||||
ENV ANDROID_NDK_REVISION 23
 | 
			
		||||
ENV ANDROID_NDK_API 23
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /build && \
 | 
			
		||||
    cd /build && \
 | 
			
		||||
    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
 | 
			
		||||
    unzip ./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.zip && \
 | 
			
		||||
    cd android-ndk-r${ANDROID_NDK_REVISION} && \
 | 
			
		||||
    ./build/tools/make_standalone_toolchain.py \
 | 
			
		||||
      --arch x86_64 \
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user