Skip to content

Commit e48a580

Browse files
cortinicofacebook-github-bot
authored andcommitted
Use NDK 23 only for Windows users. (#33611)
Summary: Pull Request resolved: #33611 Bumping the NDK to 23 to prevent build failures due to the NDK using longer paths. Changelog: [Android] [Fixed] - Use NDK 23 only for Windows users. Reviewed By: motiz88 Differential Revision: D35547459 fbshipit-source-id: 4e44c0b5fd8d1c559b04fb43eb4eeadc13943394
1 parent 86f8d0b commit e48a580

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

template/android/build.gradle

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.apache.tools.ant.taskdefs.condition.Os
2+
13
// Top-level build file where you can add configuration options common to all sub-projects/modules.
24

35
buildscript {
@@ -6,11 +8,16 @@ buildscript {
68
minSdkVersion = 21
79
compileSdkVersion = 31
810
targetSdkVersion = 31
9-
// For M1 Users we need to use the NDK 24, otherwise we default to the
10-
// side-by-side NDK version from AGP.
11+
1112
if (System.properties['os.arch'] == "aarch64") {
13+
// For M1 Users we need to use the NDK 24 which added support for aarch64
1214
ndkVersion = "24.0.8215888"
15+
} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
16+
// For Android Users, we need to use NDK 23, otherwise the build will
17+
// fail due to paths longer than the OS limit
18+
ndkVersion = "23.1.7779620"
1319
} else {
20+
// Otherwise we default to the side-by-side NDK version from AGP.
1421
ndkVersion = "21.4.7075529"
1522
}
1623
}

0 commit comments

Comments
 (0)