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

KLIB: Store native targets in manifest

Browse Source 
(cherry picked from commit 6d5bf096c9bdce8ddd2a1651c1a8b85ad07ce116)
This commit is contained in:
Dmitriy Dolovov
2020-04-03 15:28:58 +07:00
committed by Vasily Levchenko
parent 8deb61713d
commit 35e54cd8c8
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt
+5 -11
View File
@@ -34,18 +34,12 @@ open class TargetedLibraryImpl(
private val target: KonanTarget? get() = access.target private val target: KonanTarget? get() = access.target
override val targetList by lazy { override val targetList: List<String>
access.inPlace { it: TargetedKotlinLibraryLayout -> get() = nativeTargets.ifEmpty {
if (!it.targetsDir.exists) // TODO: We have a choice: either assume it is the CURRENT TARGET
// TODO: We have a choice: either assume it is the CURRENT TARGET // or a list of ALL KNOWN targets.
// or a list of ALL KNOWN targets. listOfNotNull(access.target?.visibleName)
access.target ?. let { listOf(it.visibleName) } ?: emptyList()
else
it.targetsDir.listFiles.map {
it.name
}
} }
}
override val manifestProperties: Properties by lazy { override val manifestProperties: Properties by lazy {
val properties = access.inPlace { val properties = access.inPlace {
shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt
+1 -1
View File
@@ -34,7 +34,7 @@ class KonanLibraryWriterImpl(
val layout: KonanLibraryLayoutForWriter = KonanLibraryLayoutForWriter(libDir, target), val layout: KonanLibraryLayoutForWriter = KonanLibraryLayoutForWriter(libDir, target),
base: BaseWriter = BaseWriterImpl(layout, moduleName, versions, builtInsPlatform, nopack, shortName), base: BaseWriter = BaseWriterImpl(layout, moduleName, versions, builtInsPlatform, listOf(target.visibleName), nopack, shortName),
bitcode: BitcodeWriter = BitcodeWriterImpl(layout), bitcode: BitcodeWriter = BitcodeWriterImpl(layout),
metadata: MetadataWriter = MetadataWriterImpl(layout), metadata: MetadataWriter = MetadataWriterImpl(layout),
ir: IrWriter = IrMonoliticWriterImpl(layout) ir: IrWriter = IrMonoliticWriterImpl(layout)