Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .ci/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ case "${IMAGE_NAME}" in
executorch-ubuntu-22.04-mediatek-sdk)
MEDIATEK_SDK=yes
CLANG_VERSION=12
ANDROID_NDK_VERSION=r27b
ANDROID_NDK_VERSION=r28c
;;
executorch-ubuntu-22.04-clang12-android)
LINTRUNNER=""
CLANG_VERSION=12
# From https://developer.android.com/ndk/downloads
ANDROID_NDK_VERSION=r27b
ANDROID_NDK_VERSION=r28c
;;
*)
echo "Invalid image name ${IMAGE_NAME}"
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/setup-samsung-linux-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ download_ai_lite_core() {
install_enn_backend() {
NDK_INSTALLATION_DIR=/opt/ndk
rm -rf "${NDK_INSTALLATION_DIR}" && sudo mkdir -p "${NDK_INSTALLATION_DIR}"
ANDROID_NDK_VERSION=r27b
ANDROID_NDK_VERSION=r28c

# build Exynos backend
export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT:-/opt/ndk}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
# NB: Use metal install for KVM support to run the emulator faster
runs-on: linux.24xl.spr-metal
env:
ANDROID_NDK_VERSION: r27b
ANDROID_NDK_VERSION: r28c
API_LEVEL: 34
steps:
- name: Setup SSH (Click me for login details)
Expand Down
2 changes: 1 addition & 1 deletion backends/vulkan/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ when building with CMake.

First, make sure that you have the Android NDK installed; any NDK version past
NDK r19c should work. Note that the examples in this doc have been validated with
NDK r27b. The Android SDK should also be installed so that you have access to `adb`.
NDK r28c. The Android SDK should also be installed so that you have access to `adb`.

The instructions in this page assumes that the following environment variables
are set.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/backends-vulkan.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ when building with CMake.

First, make sure that you have the Android NDK installed; any NDK version past
NDK r19c should work. Note that the examples in this doc have been validated with
NDK r27b. The Android SDK should also be installed so that you have access to `adb`.
NDK r28c. The Android SDK should also be installed so that you have access to `adb`.

The instructions in this page assumes that the following environment variables
are set.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/using-executorch-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Now you can compile your app with the ExecuTorch Android library.

You need Android [SDK](https://developer.android.com/studio) and [NDK](https://developer.android.com/ndk/downloads) to use it.

Current NDK version used in ExecuTorch CI: r27b.
Current NDK version used in ExecuTorch CI: r28c.

You need to set `ANDROID_HOME` to Android SDK home and `ANDROID_NDK` to the correct NDK root (containing NOTICE file).

Expand Down
2 changes: 1 addition & 1 deletion examples/models/llama/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ If you an error about "RE2 failed to compile pattern with lookahead:...SUPPORT_R

**1. Build llama runner binary for Android**

*Pre-requisite*: Android NDK (tested with r27b) which can be downloaded from [here](https://developer.android.com/ndk/downloads). Note that the mac binary can be unpackaged and you can locate NDK folder from it.
*Pre-requisite*: Android NDK (tested with r28c) which can be downloaded from [here](https://developer.android.com/ndk/downloads). Note that the mac binary can be unpackaged and you can locate NDK folder from it.

**1.1 Set Android NDK**
```
Expand Down
1 change: 0 additions & 1 deletion scripts/build_android_library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ build_android_native_library() {

cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
-DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
--preset "android-${ANDROID_ABI}" \
-DANDROID_PLATFORM=android-26 \
-DEXECUTORCH_ENABLE_EVENT_TRACER="${EXECUTORCH_ANDROID_PROFILING:-OFF}" \
Expand Down
Loading