Skip to content

Commit

Permalink
Bumped NDK version in net10.0 Dockerfile (#1326)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkurdek authored Jan 15, 2025
1 parent 0f7d0a3 commit 7b5e770
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/azurelinux/3.0/net10.0/android/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG ANDROID_SDK_ROOT=/usr/local/android-sdk
ARG ANDROID_NDK_VERSION=23.2.8568313
ARG ANDROID_NDK_VERSION=27.2.12479018
ARG ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION
FROM mcr.microsoft.com/openjdk/jdk:17-mariner AS android-sdk-download
ARG ANDROID_SDK_ROOT
Expand All @@ -25,10 +25,8 @@ RUN wget https://dl.google.com/android/repository/commandlinetools-linux-1107670
RUN yes | /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --licenses
RUN /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --install "build-tools;33.0.0" "platforms;android-33" "ndk;${ANDROID_NDK_VERSION}"

# We can't upgrade the NDK version as the runtime repo requires tooling that only exists up to NDK 23
# Remove all components of NDK 23 that are flagged by security scanners
RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.9/site-packages/ \
&& rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang-tidy
# Remove all components of NDK that are flagged by security scanners
RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.11/site-packages/

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64

Expand Down

0 comments on commit 7b5e770

Please sign in to comment.