diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt index 6961544849d..9aeda2ed7ed 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt @@ -87,10 +87,11 @@ class KoltinLibraryWriterImpl( versions: KotlinLibraryVersioning, builtInsPlatform: BuiltInsPlatform, nopack: Boolean = false, + shortName: String? = null, val layout: KotlinLibraryLayoutForWriter = KotlinLibraryLayoutForWriter(libDir), - val base: BaseWriter = BaseWriterImpl(layout, moduleName, versions, builtInsPlatform, nopack), + val base: BaseWriter = BaseWriterImpl(layout, moduleName, versions, builtInsPlatform, nopack, shortName), metadata: MetadataWriter = MetadataWriterImpl(layout), ir: IrWriter = IrMonoliticWriterImpl(layout) // ir: IrWriter = IrPerFileWriterImpl(layout) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt index fb7fe4309b2..46d3b8b81b4 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt @@ -222,7 +222,8 @@ class NativeDistributionCommonizer( manifestData.uniqueName, manifestData.versions, BuiltInsPlatform.NATIVE, - nopack = true + nopack = true, + shortName = manifestData.shortName ) library.addMetadata(metadata) manifestData.applyTo(library.base as BaseWriterImpl) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt index 36825447f25..e1189fc4f4d 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt @@ -15,7 +15,8 @@ internal data class NativeSensitiveManifestData( val dependencies: List, val isInterop: Boolean, val packageFqName: String?, - val exportForwardDeclarations: List + val exportForwardDeclarations: List, + val shortName: String? ) { fun applyTo(library: BaseWriterImpl) { library.manifestProperties[KLIB_PROPERTY_UNIQUE_NAME] = uniqueName @@ -34,6 +35,7 @@ internal data class NativeSensitiveManifestData( addOptionalProperty(KLIB_PROPERTY_EXPORT_FORWARD_DECLARATIONS, exportForwardDeclarations.isNotEmpty()) { exportForwardDeclarations.joinToString(separator = " ") } + addOptionalProperty(KLIB_PROPERTY_SHORT_NAME, shortName != null) { shortName!! } } companion object { @@ -43,7 +45,8 @@ internal data class NativeSensitiveManifestData( dependencies = library.manifestProperties.propertyList(KLIB_PROPERTY_DEPENDS, escapeInQuotes = true), isInterop = library.isInterop, packageFqName = library.packageFqName, - exportForwardDeclarations = library.exportForwardDeclarations + exportForwardDeclarations = library.exportForwardDeclarations, + shortName = library.shortName ) } }