Add plumbing for changing the CMake version.

The value I've set here is no different from the default, but soon it will be (hopefully), and this makes it easier to test a newer CMake.
android · Sep 11, 2024 · bc535ee · bc535ee
1 parent 121154b
commit bc535ee
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/...ic/src/main/java/com/android/ndk/samples/buildlogic/AndroidApplicationConventionPlugin.kt b/...ic/src/main/java/com/android/ndk/samples/buildlogic/AndroidApplicationConventionPlugin.kt
@@ -16,6 +16,13 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
             extensions.configure<ApplicationExtension> {
                 compileSdk = Versions.COMPILE_SDK
                 ndkVersion = Versions.NDK
+
+                externalNativeBuild {
+                    cmake {
+                        version = Versions.CMAKE
+                    }
+                }
+
                 defaultConfig {
                     minSdk = Versions.MIN_SDK
                     targetSdk = Versions.TARGET_SDK

diff --git a/...-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidLibraryConventionPlugin.kt b/...-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidLibraryConventionPlugin.kt
@@ -15,6 +15,13 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             extensions.configure<LibraryExtension> {
                 compileSdk = Versions.COMPILE_SDK
                 ndkVersion = Versions.NDK
+
+                externalNativeBuild {
+                    cmake {
+                        version = Versions.CMAKE
+                    }
+                }
+
                 defaultConfig {
                     minSdk = Versions.MIN_SDK
                     lint {

diff --git a/build-logic/src/main/java/com/android/ndk/samples/buildlogic/Versions.kt b/build-logic/src/main/java/com/android/ndk/samples/buildlogic/Versions.kt
@@ -7,5 +7,6 @@ object Versions {
     const val TARGET_SDK = 34
     const val MIN_SDK = 21
     const val NDK = "27.1.12297006" // r27b
+    const val CMAKE = "3.22.1"
     val JAVA = JavaVersion.VERSION_1_8
 }