azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move Kotlin/Native metadata deserialization and KLIB reader to a separate module (#1908)

Browse Source 
1. move Kotlin/Native metadata deserialization and KLIB reader to a separate module
2. decouple KLIB reader from ModuleDescriptor creation
This commit is contained in:
Dmitriy Dolovov
2018-08-22 14:01:20 +03:00
committed by GitHub
parent 0f00b39fda
commit f0cfbb9918
47 changed files with 610 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utilities/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt
+1 -5
View File
@@ -16,12 +16,9 @@
package org.jetbrains.kotlin.cli.utilities
import org.jetbrains.kotlin.backend.konan.library.impl.KonanLibrary
import org.jetbrains.kotlin.backend.konan.library.resolveLibrariesRecursive
import org.jetbrains.kotlin.konan.TempFiles
import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.library.defaultResolver
import org.jetbrains.kotlin.konan.properties.loadProperties
import org.jetbrains.kotlin.konan.target.PlatformManager
import org.jetbrains.kotlin.native.interop.gen.jvm.interop
import org.jetbrains.kotlin.utils.addIfNotNull
@@ -75,8 +72,7 @@ fun invokeInterop(flavor: String, args: Array<String>): Array<String> {
)
val importArgs = allLibraries.flatMap {
val library = KonanLibrary(it.libraryFile)
val manifestProperties = library.manifestFile.loadProperties()
val manifestProperties = it.manifestProperties
// TODO: handle missing properties?
manifestProperties["package"]?.let {
val pkg = it as String