Use CMake 3.24.0+ for Android (#3065)

maplibre · Dec 3, 2024 · 5c8dd71 · 5c8dd71
1 parent c548212
commit 5c8dd71
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/platform/android/android.cmake b/platform/android/android.cmake
@@ -146,6 +146,14 @@ target_include_directories(
     ${PROJECT_SOURCE_DIR}/src
 )
 
+# this is needed because Android is not officially supported
+# https://discourse.cmake.org/t/error-when-crosscompiling-with-whole-archive-target-link/9394
+# https://cmake.org/cmake/help/latest/release/3.24.html#generator-expressions
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE 
+"-Wl,--whole-archive <LIBRARY> -Wl,--no-whole-archive"
+)
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED True)
+
 find_package(curl CONFIG)
 
 target_link_libraries(

diff --git a/platform/android/buildSrc/src/main/kotlin/Versions.kt b/platform/android/buildSrc/src/main/kotlin/Versions.kt
@@ -1,4 +1,4 @@
 object Versions {
-    const val ndkVersion ="27.0.12077973"
-    const val cmakeVersion = "3.18.1+"
+    const val ndkVersion = "27.0.12077973"
+    const val cmakeVersion = "3.24.0+"
 }
diff --git a/test/android/app/build.gradle.kts b/test/android/app/build.gradle.kts
@@ -47,7 +47,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version = "3.18.1+"
+            version = "3.24.0+"
             path = file("../../../CMakeLists.txt")
         }
     }