NDK 27 support for the Search SDK v1 (#358)

DzmitryFomchyn · web-flow · commit 412eb197a9f2 · 2025-08-28T15:46:45.000+02:00
* Support NDK 27

* Update demo app
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -158,8 +158,8 @@ commands:
           command: |
             gcloud firebase test android run \
             	--type robo --app MapboxSearch/sample/build/outputs/apk/release/sample-release.apk \
-            	--device model=Pixel2,version=30,locale=en,orientation=portrait \
-            	--device model=Nexus6,version=24,locale=en,orientation=portrait \
+            	--device model=panther,version=33,locale=en,orientation=portrait \
+            	--device model=MediumPhone.arm,version=26,locale=en,orientation=portrait \
             	--timeout 900s \
             	--project mapbox-search-android
 
@@ -171,8 +171,8 @@ commands:
           command: |
             gcloud firebase test android run \
             	--type instrumentation --app MapboxSearch/sample/build/outputs/apk/debug/sample-debug.apk --test MapboxSearch/sample/build/outputs/apk/androidTest/debug/sample-debug-androidTest.apk \
-            	--device model=Pixel2,version=30,locale=en,orientation=portrait \
-            	--device model=Nexus6,version=24,locale=en,orientation=portrait \
+            	--device model=panther,version=33,locale=en,orientation=portrait \
+            	--device model=MediumPhone.arm,version=26,locale=en,orientation=portrait \
             	--timeout 900s \
             	--project mapbox-search-android
 
@@ -193,8 +193,8 @@ commands:
             ./gradlew :<< parameters.module_name >>:assembleDebugAndroidTest -Pcoverage
             gcloud firebase test android run \
               --type instrumentation --app sample/build/outputs/apk/debug/sample-debug.apk --test << parameters.module_name >>/build/outputs/apk/androidTest/debug/<< parameters.archives_base_name >>-debug-androidTest.apk --environment-variables coverage=true,coverageFile=/sdcard/coverage.ec --directories-to-pull /sdcard --results-dir=$CIRCLE_BUILD_NUM \
-              --device model=Pixel2,version=30,locale=en,orientation=portrait \
-              --device model=Nexus6,version=24,locale=en,orientation=portrait \
+            	--device model=panther,version=33,locale=en,orientation=portrait \
+            	--device model=MediumPhone.arm,version=26,locale=en,orientation=portrait \
               --timeout 900s \
               --project mapbox-search-android
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog for the Mapbox Search SDK for Android
 
+## 1.5.0
+
+### New features
+- Added support for Android 16 KB page-size devices. To consume SDK compatible with NDK 27 you need to add `-ndk27` suffix to the artifact name, for example, `com.mapbox.search:mapbox-search-android` -> `com.mapbox.search:mapbox-search-android-ndk27`.
+
+### Mapbox dependencies
+- Search Native SDK `1.5.1`
+- Common SDK `23.11.4`
+- Maps SDK `10.19.0`
+
+
+
 ## 1.4.0
 
 ### Bug fixes
diff --git a/DemoApps/SearchWithMaps/app/build.gradle b/DemoApps/SearchWithMaps/app/build.gradle
@@ -40,8 +40,8 @@ android {
 }
 
 dependencies {
-    implementation "com.mapbox.search:mapbox-search-android-ui:1.0.0-rc.5"
-    implementation "com.mapbox.maps:android:10.14.0-beta.1"
+    implementation "com.mapbox.search:mapbox-search-android-ui-ndk27:1.5.0-SNAPSHOT"
+    implementation "com.mapbox.maps:android-ndk27:10.19.0"
 
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
diff --git a/DemoApps/SearchWithMaps/settings.gradle b/DemoApps/SearchWithMaps/settings.gradle
@@ -26,6 +26,17 @@ dependencyResolutionManagement {
                 password = sdkRegistryToken
             }
         }
+
+        maven {
+            url 'https://api.mapbox.com/downloads/v2/snapshots/maven'
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                username = "mapbox"
+                password = sdkRegistryToken
+            }
+        }
     }
 }
 rootProject.name = "SearchWithMaps"
diff --git a/LICENSE.md b/LICENSE.md
@@ -4,7 +4,7 @@ Mapbox Search SDK for Android version 1.0
 
 Mapbox Search Android SDK
 
-Copyright &copy; 2021 - 2024 Mapbox, Inc. All rights reserved.
+Copyright &copy; 2021 - 2025 Mapbox, Inc. All rights reserved.
 
 The software and files in this repository (collectively, "Software") are licensed under the Mapbox TOS for use only with the relevant Mapbox product(s) listed at www.mapbox.com/pricing. This license allows developers with a current active Mapbox account to use and modify the authorized portions of the Software as needed for use only with the relevant Mapbox product(s) through their Mapbox account in accordance with the Mapbox TOS.  This license terminates automatically if a developer no longer has a Mapbox account in good standing or breaches the Mapbox TOS. For the license terms, please see the Mapbox TOS at https://www.mapbox.com/legal/tos/ which incorporates the Mapbox Product Terms at www.mapbox.com/legal/service-terms.  If this Software is a SDK, modifications that change or interfere with marked portions of the code related to billing, accounting, or data collection are not authorized and the SDK sends limited de-identified location and usage data which is used in accordance with the Mapbox TOS. [Updated 2023-03]
 ---------------------------------------
diff --git a/MapboxSearch/autofill/build.gradle b/MapboxSearch/autofill/build.gradle
@@ -84,7 +84,7 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_5_version"
     testImplementation project(":common-tests")
 
-    androidTestImplementation "com.mapbox.common:okhttp:$common_sdk_version"
+    androidTestImplementation dependenciesList.mapboxCommonOkHttp
     androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_core_version"
diff --git a/MapboxSearch/base/build.gradle b/MapboxSearch/base/build.gradle
@@ -61,15 +61,14 @@ android {
 
 dependencies {
     api project(path: ':sdk-common')
-    api "com.mapbox.search:mapbox-search-android-native:$search_native_version"
-
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
-
-    implementation "com.mapbox.common:common:$common_sdk_version"
+    api dependenciesList.mapboxSearchNative
+    implementation dependenciesList.mapboxCommon
 
     // Explicit dependency for http service implementation, should be declared on the Common SDK side
-    implementation "com.mapbox.common:okhttp:$common_sdk_version"
+    implementation dependenciesList.mapboxCommonOkHttp
 
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
+    
     implementation "com.mapbox.base:annotations:$mapbox_base_version"
 
     implementation "androidx.core:core-ktx:$androidx_core_version"
@@ -88,7 +87,7 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_5_version"
     testImplementation project(":common-tests")
 
-    androidTestImplementation "com.mapbox.common:okhttp:$common_sdk_version"
+    androidTestImplementation dependenciesList.mapboxCommonOkHttp
     androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_core_version"
diff --git a/MapboxSearch/build.gradle b/MapboxSearch/build.gradle
@@ -32,7 +32,7 @@ buildscript {
         pitest "org.pitest:pitest-junit5-plugin:0.15"
         classpath "pl.droidsonroids.gradle:gradle-pitest-plugin:0.2.8"
         classpath "com.jaredsburrows:gradle-license-plugin:0.8.90"
-        classpath 'com.mapbox.gradle.plugins:sdk-registry:0.7.0'
+        classpath 'com.mapbox.gradle.plugins:sdk-registry:1.4.1'
         classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.3.0'
     }
 }
diff --git a/MapboxSearch/common-tests/build.gradle b/MapboxSearch/common-tests/build.gradle
@@ -36,9 +36,9 @@ android {
 dependencies {
     api "nl.jqno.equalsverifier:equalsverifier:$equals_verifier_version"
 
-    api "com.mapbox.search:mapbox-search-android-native:$search_native_version"
+    api dependenciesList.mapboxSearchNative
 
-    implementation "com.mapbox.common:common:$common_sdk_version"
+    implementation dependenciesList.mapboxCommon
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "junit:junit:$junit_version"
diff --git a/MapboxSearch/discover/build.gradle b/MapboxSearch/discover/build.gradle
@@ -87,7 +87,7 @@ dependencies {
 
     testImplementation project(":common-tests")
 
-    androidTestImplementation "com.mapbox.common:okhttp:$common_sdk_version"
+    androidTestImplementation dependenciesList.mapboxCommonOkHttp
     androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_core_version"
diff --git a/MapboxSearch/gradle.properties b/MapboxSearch/gradle.properties
@@ -21,7 +21,7 @@ android.enableJetifier=false
 kotlin.code.style=official
 
 # SDK version attributes
-VERSION_NAME=1.4.0
+VERSION_NAME=1.5.0
 
 # Artifact attributes
 mapboxArtifactUserOrg=mapbox
diff --git a/MapboxSearch/gradle/publish.gradle b/MapboxSearch/gradle/publish.gradle
@@ -1,7 +1,14 @@
 apply plugin: 'maven-publish'
 apply plugin: 'com.mapbox.sdkRegistry'
 
-project.archivesBaseName = project.property('mapboxArtifactName')
+def artifactName = ""
+if (project.hasProperty("ndkMajor")) {
+    artifactName = "${project.property('mapboxArtifactName')}-ndk${project.property("ndkMajor")}"
+} else {
+    artifactName = "${project.property('mapboxArtifactName')}"
+}
+
+project.archivesBaseName = artifactName
 project.version = project.property('VERSION_NAME')
 group = project.property('mapboxArtifactGroup')
 version = project.property('VERSION_NAME')
@@ -13,7 +20,7 @@ afterEvaluate {
                 from components.release
 
                 groupId project.property('mapboxArtifactGroup')
-                artifactId project.property('mapboxArtifactName')
+                artifactId artifactName
                 version project.property('VERSION_NAME')
 
                 artifact(androidSourcesJar)
@@ -68,7 +75,7 @@ registry {
     sdkName = sdkNameMap[project.name]
     production = true
     snapshot = version.endsWith("-SNAPSHOT")
-    override = snapshot ? true : false
+    override = snapshot
     dryRun = project.properties['sdkRegistryDryRun'] ?: false
     publications = ["MapboxAndroidSDKPublication"]
 }
diff --git a/MapboxSearch/gradle/versions.gradle b/MapboxSearch/gradle/versions.gradle
@@ -41,15 +41,28 @@ ext {
 
     pitest_version = '1.6.7'
 
-    mapbox_maps_version = '10.18.1'
-    common_sdk_version = '23.10.1'
+    mapbox_maps_version = '10.19.0'
+    common_sdk_version = '23.11.4'
     mapbox_base_version = '0.8.0'
 
-    search_native_version = '1.4.0'
+    search_native_version = '1.5.1'
 
     detekt_version = '1.19.0'
 
     leakcanary_version = '2.8.1'
 
     jacoco_tool_version = '0.8.7'
+
+    def ndkVersionSuffix = ""
+    if (project.hasProperty("ndkMajor")) {
+        ndkVersionSuffix = "-ndk${project.property("ndkMajor")}"
+        println("Building with NDK version suffix: " + ndkVersionSuffix)
+    }
+
+    dependenciesList = [
+            mapboxSearchNative: "com.mapbox.search:mapbox-search-android-native$ndkVersionSuffix:${search_native_version}",
+            mapboxCommon      : "com.mapbox.common:common$ndkVersionSuffix:${common_sdk_version}",
+            mapboxCommonOkHttp: "com.mapbox.common:okhttp$ndkVersionSuffix:${common_sdk_version}",
+            mapboxMaps        : "com.mapbox.maps:android$ndkVersionSuffix:${mapbox_maps_version}",
+    ]
 }
diff --git a/MapboxSearch/offline/build.gradle b/MapboxSearch/offline/build.gradle
@@ -84,7 +84,7 @@ dependencies {
     implementation "androidx.core:core-ktx:$androidx_core_version"
     implementation "androidx.startup:startup-runtime:$androidx_startup_runtime_version"
 
-    api "com.mapbox.common:common:$common_sdk_version"
+    api dependenciesList.mapboxCommon
 
     implementation "com.mapbox.base:annotations:$mapbox_base_version"
 
@@ -110,7 +110,7 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_5_version"
     testImplementation project(":common-tests")
 
-    androidTestImplementation "com.mapbox.common:okhttp:$common_sdk_version"
+    androidTestImplementation dependenciesList.mapboxCommonOkHttp
     androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_core_version"
diff --git a/MapboxSearch/place-autocomplete/build.gradle b/MapboxSearch/place-autocomplete/build.gradle
@@ -86,7 +86,7 @@ dependencies {
 
     testImplementation project(":common-tests")
 
-    androidTestImplementation "com.mapbox.common:okhttp:$common_sdk_version"
+    androidTestImplementation dependenciesList.mapboxCommonOkHttp
     androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_core_version"
diff --git a/MapboxSearch/sample/build.gradle b/MapboxSearch/sample/build.gradle
@@ -96,7 +96,7 @@ dependencies {
     implementation "androidx.core:core-ktx:$androidx_core_version"
     implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
 
-    implementation "com.mapbox.maps:android:$mapbox_maps_version"
+    implementation dependenciesList.mapboxMaps
     implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.15.0'
 
     ktlint "com.pinterest:ktlint:$ktlint_version"
diff --git a/MapboxSearch/sdk-common/build.gradle b/MapboxSearch/sdk-common/build.gradle
@@ -76,12 +76,12 @@ android {
 }
 
 dependencies {
-    implementation "com.mapbox.search:mapbox-search-android-native:$search_native_version"
+    implementation dependenciesList.mapboxSearchNative
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "androidx.annotation:annotation:$androidx_annotation_version"
 
-    api "com.mapbox.common:common:$common_sdk_version"
+    api dependenciesList.mapboxCommon
 
     ktlint "com.pinterest:ktlint:$ktlint_version"
 
diff --git a/MapboxSearch/sdk/build.gradle b/MapboxSearch/sdk/build.gradle
@@ -79,7 +79,7 @@ dependencies {
     implementation project(path: ':base')
     api project(path: ':sdk-common')
 
-    implementation "com.mapbox.search:mapbox-search-android-native:$search_native_version"
+    implementation dependenciesList.mapboxSearchNative
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
@@ -88,7 +88,7 @@ dependencies {
     implementation "androidx.core:core-ktx:$androidx_core_version"
     implementation "androidx.startup:startup-runtime:$androidx_startup_runtime_version"
 
-    api "com.mapbox.common:common:$common_sdk_version"
+    api dependenciesList.mapboxCommon
 
     implementation "com.mapbox.base:annotations:$mapbox_base_version"
 
@@ -112,7 +112,7 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_5_version"
     testImplementation project(":common-tests")
 
-    androidTestImplementation "com.mapbox.common:okhttp:$common_sdk_version"
+    androidTestImplementation dependenciesList.mapboxCommonOkHttp
     androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_core_version"
diff --git a/MapboxSearch/ui/build.gradle b/MapboxSearch/ui/build.gradle
@@ -97,7 +97,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     androidTestImplementation project(":common-tests")
-    androidTestImplementation "com.mapbox.common:okhttp:$common_sdk_version"
+    androidTestImplementation dependenciesList.mapboxCommonOkHttp
     androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_core_version"
diff --git a/scripts/ci-publish.sh b/scripts/ci-publish.sh
@@ -4,15 +4,16 @@ set -eo pipefail
 
 pushd MapboxSearch/
 
+modules=("sdk-common" "base" "sdk" "ui" "offline" "autofill" "discover" "place-autocomplete")
+
 ./gradlew clean
+for module in "${modules[@]}"; do
+  ./gradlew ":$module:mapboxSDKRegistryUpload"
+done
 
-./gradlew :sdk-common:mapboxSDKRegistryUpload
-./gradlew :base:mapboxSDKRegistryUpload
-./gradlew :sdk:mapboxSDKRegistryUpload
-./gradlew :ui:mapboxSDKRegistryUpload
-./gradlew :offline:mapboxSDKRegistryUpload
-./gradlew :autofill:mapboxSDKRegistryUpload
-./gradlew :discover:mapboxSDKRegistryUpload
-./gradlew :place-autocomplete:mapboxSDKRegistryUpload
+./gradlew clean
+for module in "${modules[@]}"; do
+  ./gradlew ":$module:mapboxSDKRegistryUpload" "-PndkMajor=27"
+done
 
 popd
diff --git a/scripts/local_checks.sh b/scripts/local_checks.sh
@@ -49,6 +49,7 @@ pushd MapboxSearch/
 if [ "$1" = "--runInstrumentationTests" ]; then
   # TODO start emulator if there's no active
   ./gradlew connectedAndroidTest mergeAndroidReports --continue
+  ./gradlew connectedAndroidTest mergeAndroidReports --continue -PndkMajor=27
 fi
 
 popd
diff --git a/scripts/sdk-registry-config-templates/search-autofill-android.yaml b/scripts/sdk-registry-config-templates/search-autofill-android.yaml
@@ -6,6 +6,7 @@ android:
 packages:
   android:
     - autofill
+    - autofill-ndk27
 
 bundles:
   android: autofill-all
diff --git a/scripts/sdk-registry-config-templates/search-base-android.yaml b/scripts/sdk-registry-config-templates/search-base-android.yaml
@@ -6,6 +6,7 @@ android:
 packages:
   android:
     - base
+    - base-ndk27
 
 bundles:
   android: base-all
diff --git a/scripts/sdk-registry-config-templates/search-discover-android.yaml b/scripts/sdk-registry-config-templates/search-discover-android.yaml
@@ -6,6 +6,7 @@ android:
 packages:
   android:
     - discover
+    - discover-ndk27
 
 bundles:
   android: discover-all
diff --git a/scripts/sdk-registry-config-templates/search-offline-android.yaml b/scripts/sdk-registry-config-templates/search-offline-android.yaml
@@ -6,6 +6,7 @@ android:
 packages:
   android:
     - offline
+    - offline-ndk27
 
 bundles:
   android: offline-all
diff --git a/scripts/sdk-registry-config-templates/search-place-autocomplete-android.yaml b/scripts/sdk-registry-config-templates/search-place-autocomplete-android.yaml
@@ -6,6 +6,7 @@ android:
 packages:
   android:
     - place-autocomplete
+    - place-autocomplete-ndk27
 
 bundles:
   android: place-autocomplete-all
diff --git a/scripts/sdk-registry-config-templates/search-sdk-android-ios.yaml b/scripts/sdk-registry-config-templates/search-sdk-android-ios.yaml
diff --git a/scripts/sdk-registry-config-templates/search-sdk-android.yaml b/scripts/sdk-registry-config-templates/search-sdk-android.yaml
diff --git a/scripts/sdk-registry-config-templates/search-sdk-common-android.yaml b/scripts/sdk-registry-config-templates/search-sdk-common-android.yaml
diff --git a/scripts/sdk-registry-config-templates/search-ui-sdk-android.yaml b/scripts/sdk-registry-config-templates/search-ui-sdk-android.yaml

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ android {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`dependencies {`
`43`		`- implementation "com.mapbox.search:mapbox-search-android-ui:1.0.0-rc.5"`
`44`		`- implementation "com.mapbox.maps:android:10.14.0-beta.1"`
	`43`	`+ implementation "com.mapbox.search:mapbox-search-android-ui-ndk27:1.5.0-SNAPSHOT"`
	`44`	`+ implementation "com.mapbox.maps:android-ndk27:10.19.0"`
`45`	`45`
`46`	`46`	`implementation 'androidx.core:core-ktx:1.10.1'`
`47`	`47`	`implementation 'androidx.appcompat:appcompat:1.6.1'`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,17 @@ dependencyResolutionManagement {`
`26`	`26`	`password = sdkRegistryToken`
`27`	`27`	`}`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ maven {`
	`31`	`+ url 'https://api.mapbox.com/downloads/v2/snapshots/maven'`
	`32`	`+ authentication {`
	`33`	`+ basic(BasicAuthentication)`
	`34`	`+ }`
	`35`	`+ credentials {`
	`36`	`+ username = "mapbox"`
	`37`	`+ password = sdkRegistryToken`
	`38`	`+ }`
	`39`	`+ }`
`29`	`40`	`}`
`30`	`41`	`}`
`31`	`42`	`rootProject.name = "SearchWithMaps"`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ buildscript {`
`32`	`32`	`pitest "org.pitest:pitest-junit5-plugin:0.15"`
`33`	`33`	`classpath "pl.droidsonroids.gradle:gradle-pitest-plugin:0.2.8"`
`34`	`34`	`classpath "com.jaredsburrows:gradle-license-plugin:0.8.90"`
`35`		`- classpath 'com.mapbox.gradle.plugins:sdk-registry:0.7.0'`
	`35`	`+ classpath 'com.mapbox.gradle.plugins:sdk-registry:1.4.1'`
`36`	`36`	`classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.3.0'`
`37`	`37`	`}`
`38`	`38`	`}`