Skip to content

Commit 879d48b

Browse files
committed
chore: improve ndkVersion/NDK_PATH fallbacks
1 parent 4f3a0d7 commit 879d48b

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

test-app/runtime/build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ if (useCCache) {
2121
}
2222

2323

24+
def defaultNdkVersion = "23.2.8568313"
2425

2526
def hasNdkVersion = project.hasProperty("ndkVersion")
2627
if (hasNdkVersion) {
@@ -46,6 +47,15 @@ if(!hasNdkDirectory){
4647
} else {
4748
NDK_PATH = ndkDirectory
4849
}
50+
51+
if(NDK_PATH == null || NDK_PATH == "null" || NDK_PATH == "") {
52+
if(!hasNdkVersion){
53+
NDK_PATH = "$System.env.ANDROID_HOME/ndk/${defaultNdkVersion}"
54+
} else {
55+
NDK_PATH = "$System.env.ANDROID_HOME/ndk/${ndkVersion}"
56+
}
57+
}
58+
4959
println "Runtime using NDK_PATH: " + NDK_PATH
5060

5161
android {
@@ -67,8 +77,7 @@ android {
6777
if (hasNdkVersion) {
6878
ndkVersion ndkVersion
6979
} else {
70-
ndkVersion "23.2.8568313"
71-
// ndkVersion "22.1.7171670"
80+
ndkVersion defaultNdkVersion
7281
}
7382

7483
defaultConfig {

0 commit comments

Comments
 (0)