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

[platformLibs] Support -nopack option for metadata mode

Browse Source
This commit is contained in:
Sergey Bogolepov
2020-02-06 12:54:36 +07:00
committed by Ilya Matveev
parent 764be2f461
commit 934b843ffa
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt
+4 -2
View File
@@ -30,7 +30,8 @@ data class LibraryCreationArguments(
val nativeBitcodePath: String, val nativeBitcodePath: String,
val target: KonanTarget, val target: KonanTarget,
val manifest: Properties, val manifest: Properties,
val dependencies: List<KotlinLibrary> val dependencies: List<KotlinLibrary>,
val nopack: Boolean
) )
fun createInteropLibrary(arguments: LibraryCreationArguments) { fun createInteropLibrary(arguments: LibraryCreationArguments) {
@@ -46,7 +47,8 @@ fun createInteropLibrary(arguments: LibraryCreationArguments) {
File(outputPathWithoutExtension), File(outputPathWithoutExtension),
arguments.moduleName, arguments.moduleName,
version, version,
arguments.target arguments.target,
nopack = arguments.nopack
).apply { ).apply {
val metadata = arguments.metadata.write(ChunkingWriteStrategy()) val metadata = arguments.metadata.write(ChunkingWriteStrategy())
addMetadata(SerializedMetadata(metadata.header, metadata.fragments, metadata.fragmentNames)) addMetadata(SerializedMetadata(metadata.header, metadata.fragments, metadata.fragmentNames))
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
+2 -1
View File
@@ -337,7 +337,8 @@ private fun processCLib(args: Array<String>, additionalArgs: Map<String, Any> =
moduleName = moduleName, moduleName = moduleName,
outputPath = cinteropArguments.output, outputPath = cinteropArguments.output,
manifest = def.manifestAddendProperties, manifest = def.manifestAddendProperties,
dependencies = allLibraryDependencies dependencies = allLibraryDependencies,
nopack = cinteropArguments.nopack
) )
createInteropLibrary(args) createInteropLibrary(args)
return null return null