Skip to content

Commit b2a6c1c

Browse files
Zayankovskygithub-actions[bot]
authored andcommitted
migrate to ndk27 variants of mapbox libraries (#10004)
GitOrigin-RevId: 9836022bdfab675c3118682a153694e5d273d650
1 parent 0ed5988 commit b2a6c1c

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

gradle/artifact-settings.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ ext {
1414
versionName = getVersionName()
1515

1616
def ndkVersionSuffix = ""
17-
if (project.hasProperty("ndkMajor")) {
18-
ndkVersionSuffix = "-ndk${project.property("ndkMajor")}"
17+
def ndkMajorVersion = project.findProperty("ndkMajor")
18+
def parentGradle = gradle.parent
19+
while (ndkMajorVersion == null && parentGradle != null) {
20+
ndkMajorVersion = parentGradle.rootProject.findProperty("ndkMajor")
21+
parentGradle = parentGradle.parent
22+
}
23+
if (ndkMajorVersion != null) {
24+
ndkVersionSuffix = "-ndk$ndkMajorVersion"
1925
println("Building with NDK version suffix: " + ndkVersionSuffix)
2026
}
2127

gradle/dependencies.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ ext {
1414
def mapboxNavigatorVersion = "324.${mapboxSdkVersionSuffix}"
1515

1616
def ndkVersionSuffix = ""
17-
if (project.hasProperty("ndkMajor")) {
18-
ndkVersionSuffix = "-ndk${project.property("ndkMajor")}"
17+
def ndkMajorVersion = project.findProperty("ndkMajor")
18+
def parentGradle = gradle.parent
19+
while (ndkMajorVersion == null && parentGradle != null) {
20+
ndkMajorVersion = parentGradle.rootProject.findProperty("ndkMajor")
21+
parentGradle = parentGradle.parent
22+
}
23+
if (ndkMajorVersion != null) {
24+
ndkVersionSuffix = "-ndk$ndkMajorVersion"
1925
println("Building with NDK version suffix: " + ndkVersionSuffix)
2026
}
2127

0 commit comments

Comments
 (0)