[klib-resolver] Resolve libraries passed as files by unique name (#2104)

This commit is contained in:
Ilya Matveev
2018-09-20 20:08:11 +03:00
committed by GitHub
parent 6aed012ae8
commit 8213df8bf2
6 changed files with 59 additions and 22 deletions
@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.target.PlatformManager
import org.jetbrains.kotlin.konan.KonanAbiVersion
import org.jetbrains.kotlin.konan.library.*
import org.jetbrains.kotlin.konan.target.Distribution
import org.jetbrains.kotlin.native.interop.gen.jvm.interop
import org.jetbrains.kotlin.utils.addIfNotNull
@@ -54,7 +55,12 @@ fun invokeInterop(flavor: String, args: Array<String>): Array<String> {
val manifest = File(buildDir, "manifest.properties")
val target = PlatformManager().targetManager(targetRequest).target
val resolver = defaultResolver(repos, target).libraryResolver()
val resolver = defaultResolver(
repos,
libraries.filter { it.contains(File.separator) },
target,
Distribution()
).libraryResolver()
val allLibraries = resolver.resolveWithDependencies(
libraries.toUnresolvedLibraries, noStdLib = true, noDefaultLibs = noDefaultLibs
).getFullList()