diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt index d654ed882d7..8aad84984f1 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt @@ -82,9 +82,9 @@ interface SplitLibraryScheme { val linkdataDir get() = File(libDir, "linkdata") val moduleHeaderFile - get() = File(linkdataDir, "") + get() = File(linkdataDir, "module") fun packageFile(packageName: String) - = File(linkdataDir, if (packageName == "") "" else packageName) + = File(linkdataDir, if (packageName == "") "root_package" else "package_$packageName") } class SplitLibraryReader(override val libDir: File, currentAbiVersion: Int, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/MetadataGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/MetadataGenerator.kt index 9705e9f6353..306858c4b71 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/MetadataGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/MetadataGenerator.kt @@ -58,7 +58,9 @@ internal class SplitMetadataGenerator(override val libDir: File): SplitLibrarySc "module_name" to "${linkData.moduleName}" )) moduleHeaderFile.writeText(linkData.module) - header.store(manifestFile.outputStream(), null) + manifestFile.outputStream().use { + header.store(it, null) + } linkData.fragments.forEachIndexed { index, it -> val name = linkData.fragmentNames[index] diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt index 54fdffdb034..63892014568 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt @@ -69,7 +69,7 @@ class File(val path: String) { private val File.zipUri: URI - get() = URI.create("jar:file:${this.absolutePath}") + get() = URI.create("jar:${this.toPath().toUri()}") private val File.zipRootPath: Path get() {