[infra] Version up NDK (#13413)

This commit is for version up NDK to latest LTS: 26.3.11579264 ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <[email protected]>
Samsung · Jul 15, 2024 · d18a3ee · d18a3ee
1 parent 8e15af3
commit d18a3ee
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docs/howto/how-to-cross-build-runtime-for-android.md b/docs/howto/how-to-cross-build-runtime-for-android.md
@@ -14,7 +14,7 @@ Or you can use `tools/cross/install_android_sdk.sh` script to prepare Android SD
 
 ### Host Environment Requirements
 
-CMake 3.6.0 or later is required for Android NDK r20 CMake support.
+CMake 3.6.0 or later is required for Android NDK r26d CMake support.
 So if you want to use Docker, please use `infra/docker/android-sdk/Dockerfile`.
 
 ```

diff --git a/infra/docker/android-sdk/Dockerfile b/infra/docker/android-sdk/Dockerfile
@@ -76,7 +76,7 @@ RUN tmp/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "cmdline-tools;${CMDTOOL
 RUN rm -rf tmp
 
 # Install android ndk and tools (other packages will be installed by gradle build)
-ARG NDK_VERSION=20.0.5594570
+ARG NDK_VERSION=26.3.11579264
 RUN ${ANDROID_HOME}/cmdline-tools/${CMDTOOLS_VERSION}/bin/sdkmanager --sdk_root=${ANDROID_HOME} "ndk;${NDK_VERSION}"
 RUN ${ANDROID_HOME}/cmdline-tools/${CMDTOOLS_VERSION}/bin/sdkmanager --sdk_root=${ANDROID_HOME} "platform-tools"
 

diff --git a/tools/cross/install_android_ndk.sh b/tools/cross/install_android_ndk.sh
@@ -19,13 +19,13 @@
 usage()
 {
     echo "Usage: $0 [--ndk-version=NDKVersion] [--install-dir=InstallDir]"
-    echo "  NDKVersion : r20(default) or higher"
+    echo "  NDKVersion : r26d(default) or other version"
     echo "  InstallDir : Path to be installed"
     exit 1
 }
 
 __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-__NDKVersion=r20
+__NDKVersion=r26d
 __UnprocessedBuildArgs=
 
 while [[ $# -gt 0 ]]

diff --git a/tools/cross/install_android_sdk.sh b/tools/cross/install_android_sdk.sh
@@ -19,7 +19,7 @@ SCRIPT_HOME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # absolute path to
 INSTALL_PATH=$SCRIPT_HOME/android_sdk # path to directory where android sdk will be installed
 PLATFORMS_PACKAGE_VERSION="29" # version of platfroms package which will be installed
 BUILD_TOOLS_PACKAGE_VERSION="29.0.3" # version of build-tools package which will be installed
-NDK_VERSION="20.0.5594570" # version of ndk which will be installed
+NDK_VERSION="26.3.11579264" # version of ndk which will be installed
 COMMAND_LINE_TOOLS_ARCHIVE="commandlinetools-linux-6514223_latest.zip" # command line tools archive name from site https://developer.android.com/studio/#downloads for bootstrap
 COMMAND_LINE_TOOLS_VERSION="10.0" # version of command line tools which will be installed