Skip to content

Commit d8a9a5c

Browse files
yunikkkgithub-actions[bot]
authored andcommitted
Fix build from source for Dash and 3DLN poc app. (#11216)
* Forward ndkMajor to composited modules to fix build from source in Dash and 3DLN app. * Update mapbox-sdk dependency. * Reorder includeBuilds of NavSDK and native dependencies to avoid issues with inclusion order. * Update mapbox-sdk. * ktlint. * Fix native camera builder usage. * Remove usage of laneMatchedFilterForDetections. * Detekt fixes. GitOrigin-RevId: 066cc2da9c97de533bdd1922051cf62940b84d64
1 parent 9f18cdd commit d8a9a5c

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

gradle/artifact-settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ext {
2222
}
2323
if (ndkMajorVersion != null) {
2424
ndkVersionSuffix = "-ndk$ndkMajorVersion"
25-
println("Building with NDK version suffix: " + ndkVersionSuffix)
2625
}
2726

2827
/**

gradle/dependencies.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ext {
1111
// mapboxSdkHdFullSparseCheckout in generate_api_docs_android.sh depends on mapboxSdkVersionSuffix
1212
// Release Train depends on these two lines below
1313
// https://github.com/mapbox/release-train/blob/bd530da200d62fb45166ef91d7d892d90a453fa6/backend/model/step/navcoreandroid/PrepareChangelogNavCore.py#L122-L124
14-
def mapboxSdkVersionSuffix = '18.0-SNAPSHOT-11-10--04-30.git-1789d03'
14+
def mapboxSdkVersionSuffix = '18.0-SNAPSHOT-11-19--15-23.git-61ef048'
1515
def mapboxNavigatorVersion = "324.${mapboxSdkVersionSuffix}"
1616

1717
def ndkVersionSuffix = ""
@@ -23,7 +23,6 @@ ext {
2323
}
2424
if (ndkMajorVersion != null) {
2525
ndkVersionSuffix = "-ndk$ndkMajorVersion"
26-
println("Building with NDK version suffix: " + ndkVersionSuffix)
2726
}
2827

2928
version = [

0 commit comments

Comments
 (0)