Skip to content

Commit 44be893

Browse files
committed
chore(git): add android cargo build
1 parent f9aab89 commit 44be893

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ FROM ubuntu:22.04
22

33
# Set environment variables for the Android SDK and NDK, and the API level.
44
ENV ANDROID_API_LEVEL="22"
5-
ENV ANDROID_NDK_VERSION=r26d
5+
ENV ANDROID_NDK_VERSION=r22
66
ENV ANDROID_SDK_ROOT="/usr/lib/android-sdk"
77
ENV ANDROID_HOME="/usr/lib/android-sdk"
8-
ENV ANDROID_NDK_HOME="${ANDROID_SDK_ROOT}/ndk/22.1.7171670"
8+
ENV ANDROID_NDK_HOME="${ANDROID_SDK_ROOT}/ndk-bundle"
99
ENV ANDROID_NDK_PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin"
1010
ENV NDK_SYSROOT="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot"
1111

@@ -36,7 +36,7 @@ RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/latest && \
3636
ENV PATH="${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin"
3737

3838
# Install Android platform, build tools, and NDK
39-
RUN yes | sdkmanager "ndk;22.1.7171670" --licenses --sdk_root=${ANDROID_SDK_ROOT}
39+
RUN yes | sdkmanager --licenses --sdk_root=${ANDROID_SDK_ROOT}
4040
RUN sdkmanager "platforms;android-${ANDROID_API_LEVEL}" "build-tools;${ANDROID_API_LEVEL}.0.0" "ndk-bundle" "cmake;3.22.1" \
4141
--sdk_root=${ANDROID_SDK_ROOT}
4242

0 commit comments

Comments
 (0)