Skip to content

Commit 37b1093

Browse files
committed
Use NDK r28c
1 parent fd9f176 commit 37b1093

File tree

8 files changed

+8
-9
lines changed

8 files changed

+8
-9
lines changed

.ci/docker/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ case "${IMAGE_NAME}" in
5454
executorch-ubuntu-22.04-mediatek-sdk)
5555
MEDIATEK_SDK=yes
5656
CLANG_VERSION=12
57-
ANDROID_NDK_VERSION=r27b
57+
ANDROID_NDK_VERSION=r28c
5858
;;
5959
executorch-ubuntu-22.04-clang12-android)
6060
LINTRUNNER=""
6161
CLANG_VERSION=12
6262
# From https://developer.android.com/ndk/downloads
63-
ANDROID_NDK_VERSION=r27b
63+
ANDROID_NDK_VERSION=r28c
6464
;;
6565
*)
6666
echo "Invalid image name ${IMAGE_NAME}"

.ci/scripts/setup-samsung-linux-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ download_ai_lite_core() {
5252
install_enn_backend() {
5353
NDK_INSTALLATION_DIR=/opt/ndk
5454
rm -rf "${NDK_INSTALLATION_DIR}" && sudo mkdir -p "${NDK_INSTALLATION_DIR}"
55-
ANDROID_NDK_VERSION=r27b
55+
ANDROID_NDK_VERSION=r28c
5656

5757
# build Exynos backend
5858
export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT:-/opt/ndk}

.github/workflows/_android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# NB: Use metal install for KVM support to run the emulator faster
5555
runs-on: linux.24xl.spr-metal
5656
env:
57-
ANDROID_NDK_VERSION: r27b
57+
ANDROID_NDK_VERSION: r28c
5858
API_LEVEL: 34
5959
steps:
6060
- name: Setup SSH (Click me for login details)

backends/vulkan/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ when building with CMake.
150150

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

155155
The instructions in this page assumes that the following environment variables
156156
are set.

docs/source/backends-vulkan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ when building with CMake.
150150

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

155155
The instructions in this page assumes that the following environment variables
156156
are set.

docs/source/using-executorch-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Now you can compile your app with the ExecuTorch Android library.
112112

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

115-
Current NDK version used in ExecuTorch CI: r27b.
115+
Current NDK version used in ExecuTorch CI: r28c.
116116

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

examples/models/llama/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ If you an error about "RE2 failed to compile pattern with lookahead:...SUPPORT_R
264264
265265
**1. Build llama runner binary for Android**
266266
267-
*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.
267+
*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.
268268
269269
**1.1 Set Android NDK**
270270
```

scripts/build_android_library.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ build_android_native_library() {
3636

3737
cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
3838
-DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
39-
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
4039
--preset "android-${ANDROID_ABI}" \
4140
-DANDROID_PLATFORM=android-26 \
4241
-DEXECUTORCH_ENABLE_EVENT_TRACER="${EXECUTORCH_ANDROID_PROFILING:-OFF}" \

0 commit comments

Comments
 (0)