Separate nativeInteropPlugin output by targets
This commit is contained in:
committed by
alexander-gorshenev
parent
2aa18d5833
commit
5441ded8ed
@@ -169,7 +169,7 @@ task start(dependsOn: "${hostName}Start")
|
||||
targetList.each { target ->
|
||||
def konanJvmArgs = ["-ea",
|
||||
"-Dkonan.home=$distDir",
|
||||
"-Djava.library.path=${project.buildDir}/nativelibs",
|
||||
"-Djava.library.path=${project.buildDir}/nativelibs/$hostName",
|
||||
"-Dfile.encoding=UTF-8"]
|
||||
|
||||
def defaultArgs = ['-nopack', '-nostdlib', '-nodefaultlibs', '-ea' ]
|
||||
|
||||
+1
-1
@@ -172,7 +172,7 @@ task distCompiler(type: Copy) {
|
||||
into('konan/lib')
|
||||
}
|
||||
|
||||
from(project(':backend.native').file('build/nativelibs')) {
|
||||
from(project(':backend.native').file("build/nativelibs/$hostName")) {
|
||||
into('konan/nativelib')
|
||||
}
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import org.gradle.api.tasks.JavaExec
|
||||
import org.gradle.api.tasks.SourceSet
|
||||
import org.gradle.api.tasks.TaskDependency
|
||||
import org.gradle.internal.reflect.Instantiator
|
||||
import org.jetbrains.kotlin.konan.target.*
|
||||
|
||||
class NamedNativeInteropConfig implements Named {
|
||||
|
||||
@@ -145,7 +146,8 @@ class NamedNativeInteropConfig implements Named {
|
||||
}
|
||||
|
||||
File getNativeLibsDir() {
|
||||
return new File(project.buildDir, "nativelibs")
|
||||
def target = new TargetManager(target).target.userName
|
||||
return new File(project.buildDir, "nativelibs/$target")
|
||||
}
|
||||
|
||||
File getGeneratedSrcDir() {
|
||||
|
||||
Reference in New Issue
Block a user