Fix incompatibility with rust and ndk

Author: emakryo

plugin/src/test/groovy/com/nishtahir/CargoBuildTest.groovy

@@ -13,15 +13,18 @@ class CargoBuildTest extends AbstractTest {
     @Unroll
     def "cargoBuild is invoked with #gradleVersion and Android plugin #androidVersion"() {
         given:
+        def ndkVersion = "21.4.7075529"
         SimpleAndroidApp.builder(temporaryFolder.root, cacheDir)
                 .withAndroidVersion(androidVersion)
                 .withKotlinDisabled()
+                .withNdkVersion(ndkVersion)
                 // TODO: .withCargo(...)
                 .build()
                 .writeProject()
 
         SimpleCargoProject.builder(temporaryFolder.root)
             .withTargets(["x86_64"])
+            .selectChannelFromNdkVersion(ndkVersion)
             .build()
             .writeProject()
 

plugin/src/test/groovy/com/nishtahir/CargoTargetTest.groovy

@@ -12,10 +12,6 @@ class CargoTargetTest extends AbstractTest {
         given:
         def androidVersion = TestVersions.latestAndroidVersionForCurrentJDK()
         def ndkVersion = "21.4.7075529"
-        def ndkVersionMajor = ndkVersion.split('\\.')[0] as int
-        // Toolchain 1.68 or later versions are not compatible to old NDK prior to r23
-        // https://blog.rust-lang.org/2023/01/09/android-ndk-update-r25.html
-        def channel = ndkVersionMajor >= 23 ? "stable" : "1.67"
 
         SimpleAndroidApp.builder(temporaryFolder.root, cacheDir)
                 .withAndroidVersion(androidVersion)
@@ -27,7 +23,7 @@ class CargoTargetTest extends AbstractTest {
 
         SimpleCargoProject.builder(temporaryFolder.root)
                 .withTargets([target])
-                .withChannel(channel)
+                .selectChannelFromNdkVersion(ndkVersion)
                 .build()
                 .writeProject()
 

plugin/src/test/groovy/com/nishtahir/NdkVersionTest.groovy

@@ -13,10 +13,6 @@ class NdkVersionTest extends AbstractTest {
         def androidVersion = TestVersions.latestAndroidVersionForCurrentJDK()
         def target = "x86_64"
         def location = "android/x86_64/librust.so"
-        def ndkVersionMajor = ndkVersion.split('\\.')[0] as int
-        // Toolchain 1.68 or later versions are not compatible to old NDK prior to r23
-        // https://blog.rust-lang.org/2023/01/09/android-ndk-update-r25.html
-        def channel = ndkVersionMajor >= 23 ? "stable" : "1.67"
 
         SimpleAndroidApp.builder(temporaryFolder.root, cacheDir)
                 .withAndroidVersion(androidVersion)
@@ -28,7 +24,7 @@ class NdkVersionTest extends AbstractTest {
 
         SimpleCargoProject.builder(temporaryFolder.root)
                 .withTargets([target])
-                .withChannel(channel)
+                .selectChannelFromNdkVersion(ndkVersion)
                 .build()
                 .writeProject()
 

plugin/src/test/groovy/com/nishtahir/SimpleCargoProject.groovy

@@ -30,6 +30,15 @@ class SimpleCargoProject {
             return this
         }
 
+        def selectChannelFromNdkVersion(ndkVersion) {
+            def ndkVersionMajor = ndkVersion.split('\\.')[0] as int
+            // Toolchain 1.68 or later versions are not compatible to old NDK prior to r23
+            // https://blog.rust-lang.org/2023/01/09/android-ndk-update-r25.html
+            this.channel = ndkVersionMajor >= 23 ? "stable" : "1.67"
+            return this
+
+        }
+
         def build() {
             if (targets.isEmpty()) {
                 throw new IllegalStateException("No targets provided")