[android/sdks] Little fix to GenerateToolchainsTask.
This commit is contained in:
parent
6898bac83d
commit
2d60a1920e
1 changed files with 14 additions and 6 deletions
|
@ -1,5 +1,10 @@
|
||||||
package com.nishtahir
|
package com.nishtahir
|
||||||
|
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
|
import org.slf4j.Logger
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
|
|
||||||
import com.android.build.gradle.*
|
import com.android.build.gradle.*
|
||||||
import org.gradle.api.DefaultTask
|
import org.gradle.api.DefaultTask
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
|
@ -19,18 +24,22 @@ open class GenerateToolchainsTask : DefaultTask() {
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fun <reified T : BaseExtension> congfigureTask(project: Project) {
|
inline fun <reified T : BaseExtension> congfigureTask(project: Project) {
|
||||||
|
val logger = LoggerFactory.getLogger("rust-android-gradle")
|
||||||
|
logger.info("An info log message logged using SLF4j 2")
|
||||||
|
|
||||||
val app = project.extensions[T::class]
|
val app = project.extensions[T::class]
|
||||||
val minApi = app.defaultConfig.minSdkVersion.apiLevel
|
val minApi = app.defaultConfig.minSdkVersion.apiLevel
|
||||||
val ndkPath = app.ndkDirectory
|
val ndkPath = app.ndkDirectory
|
||||||
|
|
||||||
if (project.getToolchainDirectory().exists()) {
|
val targets = project.extensions[CargoExtension::class].targets
|
||||||
println("Existing toolchain found.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
toolchains
|
toolchains
|
||||||
.filterNot { (arch) -> minApi < 21 && arch.endsWith("64") }
|
.filterNot { (arch) -> minApi < 21 && arch.endsWith("64") }
|
||||||
|
.filter { (arch) -> targets.contains(arch) }
|
||||||
.forEach { (arch) ->
|
.forEach { (arch) ->
|
||||||
|
if (File(project.getToolchainDirectory(), arch).exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
project.exec { spec ->
|
project.exec { spec ->
|
||||||
spec.standardOutput = System.out
|
spec.standardOutput = System.out
|
||||||
spec.errorOutput = System.out
|
spec.errorOutput = System.out
|
||||||
|
@ -41,5 +50,4 @@ open class GenerateToolchainsTask : DefaultTask() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in a new issue