Skip to content

Commit a948811

Browse files
Kudometa-codesync[bot]
authored andcommitted
bump ndk r28c (#58650)
Summary: we now use AGP 9.2.1 which default ndk version is [r28c](https://developer.android.com/build/releases/agp-9-2-0-release-notes#compatibility). it would be good to synchronize the ndk version - bump ndk to r28c `28.2.13676358` - remove unnecessary `ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES` cmake flag for 16kb page size support. ndk r28 has the default 16kb page size support - bump fbjni to 0.8.1 for facebookincubator/fbjni#119 - bump fresco to 3.9.0 for facebook/fresco#2866 ## Changelog: [ANDROID] [CHANGED] - Bump NDK to r28c, fbjni 0.8.1 and fresco 3.9.0 Pull Request resolved: #58650 Test Plan: ci passed Reviewed By: Abbondanzo Differential Revision: D124138094 Pulled By: cortinico fbshipit-source-id: c683a8b31c4a962942547131249da5940c753509
1 parent 1e05406 commit a948811

5 files changed

Lines changed: 4 additions & 9 deletions

File tree

‎packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ internal object NdkConfiguratorUtils {
5555
if (cmakeArgs.none { it.startsWith("-DANDROID_STL") }) {
5656
cmakeArgs.add("-DANDROID_STL=c++_shared")
5757
}
58-
if (cmakeArgs.none { it.startsWith("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES") }) {
59-
cmakeArgs.add("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
60-
}
6158

6259
val architectures = project.getReactNativeArchitectures()
6360
// abiFilters are split ABI are not compatible each other, so we set the abiFilters

‎packages/react-native/ReactAndroid/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,6 @@ android {
613613
"-DREACT_BUILD_DIR=$buildDir",
614614
"-DANDROID_STL=c++_shared",
615615
"-DANDROID_TOOLCHAIN=clang",
616-
"-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
617616
"-DCMAKE_POLICY_DEFAULT_CMP0069=NEW",
618617
)
619618

‎packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ android {
339339
"-DHERMES_IS_ANDROID=True",
340340
"-DANDROID_STL=c++_shared",
341341
"-DANDROID_PIE=True",
342-
"-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
343342
"-DIMPORT_HOST_COMPILERS=${File(hermesBuildDir, "ImportHostCompilers.cmake").toString()}",
344343
"-DJSI_DIR=${jsiDir}",
345344
"-DHERMES_BUILD_SHARED_JSI=True",

‎packages/react-native/gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ minSdk = "24"
44
targetSdk = "37"
55
compileSdk = "37"
66
buildTools = "37.0.0"
7-
ndkVersion = "27.1.12297006"
7+
ndkVersion = "28.2.13676358"
88
# Dependencies versions
99
agp = "9.2.1"
1010
androidx-activity = "1.10.1"
@@ -23,8 +23,8 @@ assertj = "3.21.0"
2323
binary-compatibility-validator = "0.13.2"
2424
download = "5.4.0"
2525
espresso-core = "3.6.1"
26-
fbjni = "0.7.0"
27-
fresco = "3.7.0"
26+
fbjni = "0.8.1"
27+
fresco = "3.9.0"
2828
infer-annotation = "0.18.0"
2929
javax-annotation-api = "1.3.2"
3030
javax-inject = "1"

‎private/helloworld/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
minSdkVersion = 24
1212
compileSdkVersion = 37
1313
targetSdkVersion = 35
14-
ndkVersion = "27.1.12297006"
14+
ndkVersion = "28.2.13676358"
1515
kotlinVersion = "2.1.20"
1616
}
1717
repositories {

0 commit comments

Comments
 (0)