Skip NdkUploadTask if ProjectType is undefined. Delete NdkType.

Author: priettt

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

@@ -1,6 +1,7 @@
 package io.embrace.android.gradle.plugin.tasks.ndk
 
 import io.embrace.android.gradle.plugin.Logger
+import io.embrace.android.gradle.plugin.config.ProjectType
 import io.embrace.android.gradle.plugin.config.UnitySymbolsDir
 import io.embrace.android.gradle.plugin.hash.calculateSha1ForFile
 import io.embrace.android.gradle.plugin.network.OkHttpNetworkService
@@ -32,7 +33,7 @@ import javax.xml.transform.TransformerException
  * A task that uploads NDK symbols to Embrace.
  */
 abstract class NdkUploadTask @Inject constructor(
-    objectFactory: ObjectFactory
+    objectFactory: ObjectFactory,
 ) : EmbraceUploadTask, EmbraceUploadTaskImpl(objectFactory) {
 
     private val logger = Logger(NdkUploadTask::class.java)
@@ -43,8 +44,7 @@ abstract class NdkUploadTask @Inject constructor(
 
     @get:Optional
     @get:Input
-    val ndkType: Property<NdkType> =
-        objectFactory.property(NdkType::class.java).convention(NdkType.UNDEFINED)
+    val projectType: Property<ProjectType> = objectFactory.property(ProjectType::class.java).convention(ProjectType.OTHER)
 
     @get:Internal
     val deobfuscatedFilesDirPath: DirectoryProperty = objectFactory.directoryProperty()
@@ -77,11 +77,6 @@ abstract class NdkUploadTask @Inject constructor(
             return
         }
 
-        if (ndkType.get() == NdkType.UNDEFINED) {
-            logger.warn("Cannot run NDK upload task without defining an NDK type.")
-            return
-        }
-
         try {
             generateHashedObjects()
             uploadHandshake()
@@ -123,18 +118,10 @@ abstract class NdkUploadTask @Inject constructor(
     }
 
     private fun getSoFilesByArchitecture(): Map<String, List<File>> {
-        val archFiles = when (ndkType.get()) {
-            NdkType.UNITY -> {
-                getSoFilesByArchitectureForUnity()
-            }
-
-            NdkType.NATIVE -> {
-                getSoFilesByArchitectureForNative()
-            }
-
-            else -> {
-                throw IllegalArgumentException("Cannot generate NDK map file. Unsupported NDK type.")
-            }
+        val archFiles = when (projectType.get()) {
+            ProjectType.UNITY -> getSoFilesByArchitectureForUnity()
+            ProjectType.NATIVE -> getSoFilesByArchitectureForNative()
+            else -> throw IllegalArgumentException("Cannot generate NDK map file. Unsupported NDK type.")
         }
 
         return generateArchSoMap(archFiles)
@@ -243,7 +230,7 @@ abstract class NdkUploadTask @Inject constructor(
      * @return a map of requested symbols grouped by architecture
      */
     private fun filterRequestedSymbolsFiles(
-        requestedSymbols: Map<String, List<String>>
+        requestedSymbols: Map<String, List<String>>,
     ): Map<String, Map<String, File>> {
         val selectedSymbols = mutableMapOf<String, Map<String, File>>()
         getDeobfuscatedSymbolsFiles()?.let { deobfuscatedSymbols ->

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

@@ -7,6 +7,7 @@ import io.embrace.android.gradle.plugin.gradle.nullSafeMap
 import io.embrace.android.gradle.plugin.gradle.registerTask
 import io.embrace.android.gradle.plugin.gradle.safeFlatMap
 import io.embrace.android.gradle.plugin.gradle.tryGetTaskProvider
+import io.embrace.android.gradle.plugin.instrumentation.config.model.EmbraceVariantConfig
 import io.embrace.android.gradle.plugin.network.EmbraceEndpoint
 import io.embrace.android.gradle.plugin.tasks.common.RequestParams
 import io.embrace.android.gradle.plugin.tasks.registration.EmbraceTaskRegistration
@@ -122,16 +123,8 @@ class NdkUploadTaskRegistration(
         }
 
         ndkUploadTaskProvider.configure { ndkUploadTask: NdkUploadTask ->
-            ndkUploadTask.onlyIf { embraceConfig?.ndkEnabled ?: true }
-            ndkUploadTask.ndkType.set(
-                projectType.map {
-                    when (it) {
-                        ProjectType.UNITY -> NdkType.UNITY
-                        ProjectType.NATIVE -> NdkType.NATIVE
-                        else -> NdkType.UNDEFINED
-                    }
-                }
-            )
+            ndkUploadTask.onlyIf { shouldExecuteNdkUploadTask(embraceConfig) }
+            ndkUploadTask.projectType.set(projectType)
             ndkUploadTask.mustRunAfter(object : Callable<Any> {
                 override fun call(): Any {
                     return listOfNotNull(
@@ -165,4 +158,7 @@ class NdkUploadTaskRegistration(
     } else {
         "$flavorName/$buildTypeName"
     }
+
+    private fun shouldExecuteNdkUploadTask(embraceConfig: EmbraceVariantConfig?): Boolean = embraceConfig?.ndkEnabled ?: true
+        && (projectType.orNull == ProjectType.NATIVE || projectType.orNull == ProjectType.UNITY)
 }