Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[infra] Version up NDK #13413

Merged
merged 1 commit into from
Jul 15, 2024
+5 −5
Merged

[infra] Version up NDK #13413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/howto/how-to-cross-build-runtime-for-android.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

```
Expand Down
2 changes: 1 addition & 1 deletion infra/docker/android-sdk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions tools/cross/install_android_ndk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]]
Expand Down
2 changes: 1 addition & 1 deletion tools/cross/install_android_sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading