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

[Native] TargetedLibraryImpl: Respect 'commonizerNativeTargets' property

Browse Source 
^KT-50847 Verification Pending
This commit is contained in:
sebastian.sellmair
2022-01-21 17:16:07 +01:00
committed by Space
parent 5e931a3039
commit 0fd65ab1a0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
+1 -1
View File
@@ -109,7 +109,7 @@ val KotlinLibrary.containsErrorCode: Boolean
val KotlinLibrary.commonizerTarget: String? val KotlinLibrary.commonizerTarget: String?
get() = manifestProperties.getProperty(KLIB_PROPERTY_COMMONIZER_TARGET) get() = manifestProperties.getProperty(KLIB_PROPERTY_COMMONIZER_TARGET)
val KotlinLibrary.commonizerNativeTargets: List<String>? val BaseKotlinLibrary.commonizerNativeTargets: List<String>?
get() = if (manifestProperties.containsKey(KLIB_PROPERTY_COMMONIZER_NATIVE_TARGETS)) get() = if (manifestProperties.containsKey(KLIB_PROPERTY_COMMONIZER_NATIVE_TARGETS))
manifestProperties.propertyList(KLIB_PROPERTY_COMMONIZER_NATIVE_TARGETS, escapeInQuotes = true) manifestProperties.propertyList(KLIB_PROPERTY_COMMONIZER_NATIVE_TARGETS, escapeInQuotes = true)
else null else null
kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt
+7 -6
View File
@@ -35,11 +35,12 @@ open class TargetedLibraryImpl(
private val target: KonanTarget? get() = access.target private val target: KonanTarget? get() = access.target
override val targetList: List<String> override val targetList: List<String>
get() = nativeTargets.ifEmpty { get() = commonizerNativeTargets?.takeIf { it.isNotEmpty() }
// TODO: We have a choice: either assume it is the CURRENT TARGET ?: nativeTargets.takeIf { it.isNotEmpty() }
// or a list of ALL KNOWN targets. ?: // TODO: We have a choice: either assume it is the CURRENT TARGET
listOfNotNull(access.target?.visibleName) // or a list of ALL KNOWN targets.
} listOfNotNull(access.target?.visibleName)
override val manifestProperties: Properties by lazy { override val manifestProperties: Properties by lazy {
val properties = base.manifestProperties val properties = base.manifestProperties
@@ -110,4 +111,4 @@ fun createKonanLibraryComponents(
return base.componentList.map { return base.componentList.map {
createKonanLibrary(libraryFile, it, target, isDefault) createKonanLibrary(libraryFile, it, target, isDefault)
} }
} }