Skip to content

Commit

Permalink
Update Android NDK version to 27.1.12297006 in Docker
Browse files Browse the repository at this point in the history 
Android NDK 25.2.9519653 is too old to build recent versions of
abseil-cpp with C++20 enabled.

#codehealth

PiperOrigin-RevId: 680750096
  • Loading branch information
@yukawa @hiroyuki-komatsu
yukawa authored and hiroyuki-komatsu committed Sep 30, 2024
1 parent ab98773 commit ade798c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docker/ubuntu22.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ ENV PKG_CONFIG_PATH="/home/mozc_builder/work/mozc/docker/ubuntu22.04/qt6-core-pk
ENV ANDROID_HOME /home/mozc_builder/Android/Sdk
RUN mkdir -p ${ANDROID_HOME}
RUN curl -LO https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip && unzip commandlinetools-linux-10406996_latest.zip -d ${ANDROID_HOME} && rm commandlinetools-linux-10406996_latest.zip
RUN yes | ${ANDROID_HOME}/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "cmdline-tools;latest" "platforms;android-33" "build-tools;33.0.2" "platform-tools" "ndk;25.2.9519653"
ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/25.2.9519653
RUN yes | ${ANDROID_HOME}/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "cmdline-tools;latest" "platforms;android-33" "build-tools;33.0.2" "platform-tools" "ndk;27.1.12297006"
ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/27.1.12297006

# check out Mozc source with submodules
RUN mkdir /home/mozc_builder/work/mozc
Expand Down
4 changes: 2 additions & 2 deletions docker/ubuntu24.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ RUN curl -LO https://github.com/bazelbuild/bazel/releases/download/7.1.1/bazel-7
ENV ANDROID_HOME /home/mozc_builder/Android/Sdk
RUN mkdir -p ${ANDROID_HOME}
RUN curl -LO https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip && unzip commandlinetools-linux-10406996_latest.zip -d ${ANDROID_HOME} && rm commandlinetools-linux-10406996_latest.zip
RUN yes | ${ANDROID_HOME}/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "cmdline-tools;latest" "platforms;android-33" "build-tools;33.0.2" "platform-tools" "ndk;25.2.9519653"
ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/25.2.9519653
RUN yes | ${ANDROID_HOME}/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "cmdline-tools;latest" "platforms;android-33" "build-tools;33.0.2" "platform-tools" "ndk;27.1.12297006"
ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/27.1.12297006

# check out Mozc source with submodules
RUN mkdir /home/mozc_builder/work/mozc
Expand Down

0 comments on commit ade798c

Please sign in to comment.