File tree Expand file tree Collapse file tree 2 files changed +16
-4
lines changed
Expand file tree Collapse file tree 2 files changed +16
-4
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change 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
You can’t perform that action at this time.
0 commit comments