From 2814cb32389eba889b62b9ccb0749e56e59db4d4 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Wed, 23 Sep 2026 20:15:30 +0800 Subject: [PATCH 1/2] bump ndk r28c --- .../kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt | 3 --- packages/react-native/ReactAndroid/build.gradle.kts | 1 - .../react-native/ReactAndroid/hermes-engine/build.gradle.kts | 1 - packages/react-native/gradle/libs.versions.toml | 2 +- private/helloworld/android/build.gradle | 2 +- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt index cce6aaa6b746..dbbb5497fea4 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt @@ -55,9 +55,6 @@ internal object NdkConfiguratorUtils { if (cmakeArgs.none { it.startsWith("-DANDROID_STL") }) { cmakeArgs.add("-DANDROID_STL=c++_shared") } - if (cmakeArgs.none { it.startsWith("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES") }) { - cmakeArgs.add("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON") - } val architectures = project.getReactNativeArchitectures() // abiFilters are split ABI are not compatible each other, so we set the abiFilters diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts index 381fad13d046..1412f7a3c45f 100644 --- a/packages/react-native/ReactAndroid/build.gradle.kts +++ b/packages/react-native/ReactAndroid/build.gradle.kts @@ -613,7 +613,6 @@ android { "-DREACT_BUILD_DIR=$buildDir", "-DANDROID_STL=c++_shared", "-DANDROID_TOOLCHAIN=clang", - "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON", "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW", ) diff --git a/packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts b/packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts index 0a1ea2abc558..2bef4ad45041 100644 --- a/packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts +++ b/packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts @@ -339,7 +339,6 @@ android { "-DHERMES_IS_ANDROID=True", "-DANDROID_STL=c++_shared", "-DANDROID_PIE=True", - "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON", "-DIMPORT_HOST_COMPILERS=${File(hermesBuildDir, "ImportHostCompilers.cmake").toString()}", "-DJSI_DIR=${jsiDir}", "-DHERMES_BUILD_SHARED_JSI=True", diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml index db03284c43f3..abf1248334ff 100644 --- a/packages/react-native/gradle/libs.versions.toml +++ b/packages/react-native/gradle/libs.versions.toml @@ -4,7 +4,7 @@ minSdk = "24" targetSdk = "37" compileSdk = "37" buildTools = "37.0.0" -ndkVersion = "27.1.12297006" +ndkVersion = "28.2.13676358" # Dependencies versions agp = "9.2.1" androidx-activity = "1.10.1" diff --git a/private/helloworld/android/build.gradle b/private/helloworld/android/build.gradle index 77cd37578bf0..c464424212a1 100644 --- a/private/helloworld/android/build.gradle +++ b/private/helloworld/android/build.gradle @@ -11,7 +11,7 @@ buildscript { minSdkVersion = 24 compileSdkVersion = 37 targetSdkVersion = 35 - ndkVersion = "27.1.12297006" + ndkVersion = "28.2.13676358" kotlinVersion = "2.1.20" } repositories { From 79ca12b6a4d26ff92e949bd3747b2ac102899113 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Thu, 8 Oct 2026 19:52:50 +0800 Subject: [PATCH 2/2] Bump fbjni to 0.8.1 and Fresco to 3.9.0 fbjni 0.8.1 and Fresco 3.9.0 are built with NDK r28. fbjni 0.8.1 needs __cxa_init_primary_exception from the NDK r28 libc++_shared.so, so it has to land together with the NDK r28 bump. --- packages/react-native/gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml index abf1248334ff..913a83404be7 100644 --- a/packages/react-native/gradle/libs.versions.toml +++ b/packages/react-native/gradle/libs.versions.toml @@ -23,8 +23,8 @@ assertj = "3.21.0" binary-compatibility-validator = "0.13.2" download = "5.4.0" espresso-core = "3.6.1" -fbjni = "0.7.0" -fresco = "3.7.0" +fbjni = "0.8.1" +fresco = "3.9.0" infer-annotation = "0.18.0" javax-annotation-api = "1.3.2" javax-inject = "1"