Skip to content

Commit

Permalink
Update Android NDK in Dockerfile to r28 (#1176)
Browse files Browse the repository at this point in the history 
Android NDK r28 is released with 16 KiB page size compatibility option
enabled by default [1].

Let's update our Dockerfile to make it clear that libmozc.so is
compatible with 16 KiB page size.

 [1]: https://github.com/android/ndk/releases/tag/r28

PiperOrigin-RevId: 725115333
  • Loading branch information
@yukawa
yukawa authored Feb 10, 2025
1 parent 011f9de commit 7f686f1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions docker/ubuntu22.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ RUN curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/ba
&& chmod u+x /home/mozc_builder/bin/bazelisk

## Set up Android NDK
## https://github.com/android/ndk/wiki/Home/90998c4e6080643138a764cb4aa7261261ed766b#ndk-r27b-2024-lts
RUN curl -LO https://dl.google.com/android/repository/android-ndk-r27b-linux.zip && unzip android-ndk-r27b-linux.zip && rm android-ndk-r27b-linux.zip
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r27b
## https://github.com/android/ndk/wiki/Home/24fe2d7ee3591346e0e8ae615977a15c0a4fba40#ndk-r28
RUN curl -LO https://dl.google.com/android/repository/android-ndk-r28-linux.zip && unzip android-ndk-r28-linux.zip && rm android-ndk-r28-linux.zip
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r28

# check out Mozc source with submodules
RUN mkdir /home/mozc_builder/work/mozc
Expand Down
6 changes: 3 additions & 3 deletions docker/ubuntu24.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ RUN curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/ba
&& chmod u+x /home/mozc_builder/bin/bazelisk

## Set up Android NDK
## https://github.com/android/ndk/wiki/Home/90998c4e6080643138a764cb4aa7261261ed766b#ndk-r27b-2024-lts
RUN curl -LO https://dl.google.com/android/repository/android-ndk-r27b-linux.zip && unzip android-ndk-r27b-linux.zip && rm android-ndk-r27b-linux.zip
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r27b
## https://github.com/android/ndk/wiki/Home/24fe2d7ee3591346e0e8ae615977a15c0a4fba40#ndk-r28
RUN curl -LO https://dl.google.com/android/repository/android-ndk-r28-linux.zip && unzip android-ndk-r28-linux.zip && rm android-ndk-r28-linux.zip
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r28

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

0 comments on commit 7f686f1

Please sign in to comment.