Move hasExternalNativeTask validation to ProjectTypeVerifier

Author: priettt

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/config/ProjectTypeVerifier.kt

@@ -1,6 +1,8 @@
 package io.embrace.android.gradle.plugin.config
 
 import io.embrace.android.gradle.plugin.agp.AgpWrapper
+import io.embrace.android.gradle.plugin.gradle.isTaskRegistered
+import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 
 internal object ProjectTypeVerifier {
@@ -10,9 +12,11 @@ internal object ProjectTypeVerifier {
         unitySymbolsDir: Provider<UnitySymbolsDir>,
         agpWrapper: AgpWrapper,
         behavior: PluginBehavior,
+        variantName: String,
+        project: Project,
     ): ProjectType {
         return when {
-            isNative(agpWrapper, behavior) -> ProjectType.NATIVE
+            isNative(agpWrapper, behavior, variantName, project) -> ProjectType.NATIVE
             isUnity(unitySymbolsDir.orNull) -> ProjectType.UNITY
             else -> ProjectType.OTHER
         }
@@ -27,13 +31,18 @@ internal object ProjectTypeVerifier {
      */
     private fun isNative(
         agpWrapper: AgpWrapper,
-        behavior: PluginBehavior
+        behavior: PluginBehavior,
+        variantName: String,
+        project: Project,
     ): Boolean {
-        return agpWrapper.usesCMake || agpWrapper.usesNdkBuild ||
+        return agpWrapper.usesCMake || agpWrapper.usesNdkBuild || hasExternalNativeTask(variantName, project) ||
             usesCustomNativeBuild(behavior)
     }
 
-    private fun usesCustomNativeBuild(behavior: PluginBehavior): Boolean {
-        return !behavior.customSymbolsDirectory.isNullOrEmpty()
-    }
+    private fun usesCustomNativeBuild(behavior: PluginBehavior) = !behavior.customSymbolsDirectory.isNullOrEmpty()
+
+    private fun hasExternalNativeTask(variantName: String, project: Project) = project.isTaskRegistered(
+        "externalNativeBuild",
+        variantName
+    )
 }

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/tasks/ndk/NdkUploadTaskRegistration.kt

@@ -3,7 +3,6 @@ package io.embrace.android.gradle.plugin.tasks.ndk
 import io.embrace.android.gradle.plugin.config.PluginBehavior
 import io.embrace.android.gradle.plugin.config.ProjectType
 import io.embrace.android.gradle.plugin.config.UnitySymbolsDir
-import io.embrace.android.gradle.plugin.gradle.isTaskRegistered
 import io.embrace.android.gradle.plugin.gradle.nullSafeMap
 import io.embrace.android.gradle.plugin.gradle.registerTask
 import io.embrace.android.gradle.plugin.gradle.safeFlatMap
@@ -122,29 +121,14 @@ class NdkUploadTaskRegistration(
             }
         }
 
-        val taskContainer = project.tasks
         ndkUploadTaskProvider.configure { ndkUploadTask: NdkUploadTask ->
             ndkUploadTask.onlyIf { embraceConfig?.ndkEnabled ?: true }
             ndkUploadTask.ndkType.set(
                 projectType.map {
                     when (it) {
                         ProjectType.UNITY -> NdkType.UNITY
-                        ProjectType.NATIVE -> {
-                            if (behavior.customSymbolsDirectory.isNullOrEmpty() ||
-                                taskContainer.isTaskRegistered(
-                                    "externalNativeBuild",
-                                    variantConfig.variantName
-                                )
-                            ) {
-                                NdkType.NATIVE
-                            } else {
-                                NdkType.UNDEFINED
-                            }
-                        }
-
-                        else -> {
-                            NdkType.UNDEFINED
-                        }
+                        ProjectType.NATIVE -> NdkType.NATIVE
+                        else -> NdkType.UNDEFINED
                     }
                 }
             )

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/tasks/registration/TaskRegistrar.kt

@@ -30,7 +30,7 @@ class TaskRegistrar(
     private val embraceVariantConfigurationBuilder: EmbraceVariantConfigurationBuilder,
     private val variantConfigurationsListProperty: ListProperty<VariantConfig>,
     private val networkService: NetworkService,
-    private val agpWrapper: AgpWrapper
+    private val agpWrapper: AgpWrapper,
 ) {
 
     /**
@@ -72,7 +72,7 @@ class TaskRegistrar(
         }
         val variantConfig = variantConfigurationsListProperty.get().first { it.variantName == variant.name }
         val symbolsDir = getSymbolsDir(variantConfig)
-        val projectType = getProjectType(symbolsDir, agpWrapper)
+        val projectType = getProjectType(symbolsDir, agpWrapper, variantConfig.variantName, project)
         NdkUploadTaskRegistration(behavior, symbolsDir, projectType).register(params)
         if (behavior.isIl2CppMappingFilesUploadEnabled) {
             Il2CppUploadTaskRegistration().register(params)
@@ -107,11 +107,18 @@ class TaskRegistrar(
         )
     }
 
-    private fun getProjectType(symbolsDir: Provider<UnitySymbolsDir>, agpWrapper: AgpWrapper) = project.provider {
+    private fun getProjectType(
+        symbolsDir: Provider<UnitySymbolsDir>,
+        agpWrapper: AgpWrapper,
+        variantName: String,
+        project: Project,
+    ) = this.project.provider {
         ProjectTypeVerifier.getProjectType(
             symbolsDir,
             agpWrapper,
             behavior,
+            variantName,
+            project
         )
     }