From bc535eeaf53c134bd6aa9006ac66d1afd79dd3c3 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Wed, 11 Sep 2024 12:18:40 -0700
Subject: [PATCH] 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.
---
 .../buildlogic/AndroidApplicationConventionPlugin.kt       | 7 +++++++
 .../samples/buildlogic/AndroidLibraryConventionPlugin.kt   | 7 +++++++
 .../java/com/android/ndk/samples/buildlogic/Versions.kt    | 1 +
 3 files changed, 15 insertions(+)

diff --git a/build-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidApplicationConventionPlugin.kt b/build-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidApplicationConventionPlugin.kt
index bc6832032..8305a2a43 100644
--- a/build-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/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/build-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidLibraryConventionPlugin.kt b/build-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidLibraryConventionPlugin.kt
index 1976b14f2..24cd93cae 100644
--- a/build-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidLibraryConventionPlugin.kt
+++ b/build-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
index 023d26918..1460d21e2 100644
--- 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
 }