Use cargoOutputDir

Author: Mygod

plugin/src/main/kotlin/com/nishtahir/CargoBuildTask.kt

@@ -12,6 +12,7 @@ import java.io.File
 
 open class CargoBuildTask : DefaultTask() {
     var toolchain: Toolchain? = null
+    lateinit var cargoOutputDir: String
 
 
     @Suppress("unused")
@@ -23,13 +24,6 @@ open class CargoBuildTask : DefaultTask() {
             if (toolchain == null) {
                 throw GradleException("toolchain cannot be null")
             }
-
-            project.plugins.all {
-                when (it) {
-                    is AppPlugin -> buildProjectForTarget<AppExtension>(project, toolchain, this)
-                    is LibraryPlugin -> buildProjectForTarget<LibraryExtension>(project, toolchain, this)
-                }
-            }
             // CARGO_TARGET_DIR can be used to force the use of a global, shared target directory
             // across all rust projects on a machine. Use it if it's set, otherwise use the
             // configured `targetDirectory` value, and fall back to `${module}/target`.
@@ -44,11 +38,19 @@ open class CargoBuildTask : DefaultTask() {
 
             val defaultTargetTriple = getDefaultTargetTriple(project, rustcCommand)
 
-            val cargoOutputDir = if (toolchain.target == defaultTargetTriple) {
+            cargoOutputDir = if (toolchain.target == defaultTargetTriple) {
                 "${targetDirectory}/${profile}"
             } else {
                 "${targetDirectory}/${toolchain.target}/${profile}"
             }
+
+            project.plugins.all {
+                when (it) {
+                    is AppPlugin -> buildProjectForTarget<AppExtension>(project, toolchain, this)
+                    is LibraryPlugin -> buildProjectForTarget<LibraryExtension>(project, toolchain, this)
+                }
+            }
+
             copy { spec ->
                 spec.from(File(project.projectDir, cargoOutputDir))
                 spec.into(File(buildDir, "rustJniLibs/${toolchain.folder}"))
@@ -190,8 +192,7 @@ open class CargoBuildTask : DefaultTask() {
                     environment("RUST_ANDROID_GRADLE_LINKER_WRAPPER_PY",
                             File(project.rootProject.buildDir, "linker-wrapper/linker-wrapper.py").path)
                     environment("RUST_ANDROID_GRADLE_CC", cc)
-                    environment("RUST_ANDROID_GRADLE_CC_LINK_ARG",
-                            "-o,target/${toolchain.target}/${cargoExtension.profile}/lib${cargoExtension.libname!!}.so")
+                    environment("RUST_ANDROID_GRADLE_CC_LINK_ARG", "-o,$cargoOutputDir/lib${cargoExtension.libname!!}.so")
                 }
 
                 cargoExtension.extraCargoBuildArguments?.let {