mii/mozc
1
0
Fork 0
mirror of https://github.com/mii443/mozc.git synced 2025-08-23 00:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify NDK setup in Dockerfile (#1162)

Browse Source 
This commit aims to simplify how Android NDK is set up in Dockerfile
without changing any final artifact.

With this commit Android NDK will be directly downloaded then deployed
just by unzipping the archive. As a result we no longer need to install
openjdk-17-jdk package just to run Android SDK setup.

This commit also makes it clear that the build environment for Android
requires Android NDK only. Android SDK and ANDROID_HOME environment
variable are not necessary.

There must be no difference in the final artifact.

PiperOrigin-RevId: 717365459
This commit is contained in:
Yohei Yukawa
2025-01-20 14:38:43 +09:00
committed by GitHub
parent 58ebfadae0
commit e772004b4c
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docker/ubuntu22.04/Dockerfile
View File

@ -43,10 +43,6 @@ RUN apt-get update && apt-get install -y \
libibus-1.0-dev libglib2.0-dev qt6-base-dev libgl-dev \
## Packages for misc tools
nano \
## Setting up Android SDK requires OpenJDK.
openjdk-17-jdk \
## For setting up bazel below
curl gnupg libncurses5 \
&& rm -rf /var/lib/apt/lists/*
# Working environemnt
@ -65,12 +61,10 @@ RUN curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/ba
&& mv bazelisk-linux-amd64 /home/mozc_builder/bin/bazelisk \
&& chmod u+x /home/mozc_builder/bin/bazelisk
## Set up Android SDK and NDK
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;27.1.12297006"
ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/27.1.12297006
## 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
# check out Mozc source with submodules
RUN mkdir /home/mozc_builder/work/mozc

12
docker/ubuntu24.04/Dockerfile
View File

@ -41,8 +41,6 @@ RUN apt-get update && apt-get install -y \
libibus-1.0-dev libglib2.0-dev qt6-base-dev libgl-dev \
## Packages for misc tools
nano \
## Setting up Android SDK requires OpenJDK.
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*
# Working environemnt
@ -59,12 +57,10 @@ RUN curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/ba
&& mv bazelisk-linux-amd64 /home/mozc_builder/bin/bazelisk \
&& chmod u+x /home/mozc_builder/bin/bazelisk
## Set up Android SDK and NDK
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;27.1.12297006"
ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/27.1.12297006
## 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
# check out Mozc source with submodules
RUN mkdir /home/mozc_builder/work/mozc