From ade798c4a81063c69debc3b523a8cb38d25879e5 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Mon, 30 Sep 2024 22:56:56 +0000
Subject: [PATCH] Update Android NDK version to 27.1.12297006 in Docker

Android NDK 25.2.9519653 is too old to build recent versions of
abseil-cpp with C++20 enabled.

#codehealth

PiperOrigin-RevId: 680750096
---
 docker/ubuntu22.04/Dockerfile | 4 ++--
 docker/ubuntu24.04/Dockerfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/ubuntu22.04/Dockerfile b/docker/ubuntu22.04/Dockerfile
index ec5eb5532..4a166a292 100644
--- a/docker/ubuntu22.04/Dockerfile
+++ b/docker/ubuntu22.04/Dockerfile
@@ -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
diff --git a/docker/ubuntu24.04/Dockerfile b/docker/ubuntu24.04/Dockerfile
index 6e4fa8cb4..677b5b7c5 100644
--- a/docker/ubuntu24.04/Dockerfile
+++ b/docker/ubuntu24.04/Dockerfile
@@ -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