[KLIB] Extract "ir_provider" manifest property name as a const val, p.2
This commit is contained in:
committed by
Space Team
parent
04998cff8a
commit
56bebeaf92
+2
-3
@@ -7,8 +7,8 @@ package org.jetbrains.kotlin.library.metadata
|
||||
|
||||
import org.jetbrains.kotlin.descriptors.SourceFile
|
||||
import org.jetbrains.kotlin.konan.library.KLIB_INTEROP_IR_PROVIDER_IDENTIFIER
|
||||
import org.jetbrains.kotlin.library.KLIB_PROPERTY_IR_PROVIDER
|
||||
import org.jetbrains.kotlin.library.KotlinLibrary
|
||||
import org.jetbrains.kotlin.library.irProviderName
|
||||
import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf.Header
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
|
||||
@@ -44,5 +44,4 @@ class KlibDeserializedContainerSource(
|
||||
override fun getContainingFile(): SourceFile = SourceFile.NO_SOURCE_FILE
|
||||
}
|
||||
|
||||
private fun KotlinLibrary.isInteropLibrary() =
|
||||
manifestProperties[KLIB_PROPERTY_IR_PROVIDER] == KLIB_INTEROP_IR_PROVIDER_IDENTIFIER
|
||||
private fun KotlinLibrary.isInteropLibrary() = irProviderName == KLIB_INTEROP_IR_PROVIDER_IDENTIFIER
|
||||
|
||||
@@ -115,6 +115,9 @@ val KotlinLibrary.exportForwardDeclarations: List<String>
|
||||
val KotlinLibrary.includedForwardDeclarations: List<String>
|
||||
get() = manifestProperties.propertyList(KLIB_PROPERTY_INCLUDED_FORWARD_DECLARATIONS, escapeInQuotes = true)
|
||||
|
||||
val BaseKotlinLibrary.irProviderName: String?
|
||||
get() = manifestProperties.getProperty(KLIB_PROPERTY_IR_PROVIDER)
|
||||
|
||||
val BaseKotlinLibrary.nativeTargets: List<String>
|
||||
get() = manifestProperties.propertyList(KLIB_PROPERTY_NATIVE_TARGETS)
|
||||
|
||||
|
||||
@@ -253,7 +253,7 @@ abstract class KotlinLibraryProperResolverWithAttributes<L : KotlinLibrary>(
|
||||
return false
|
||||
}
|
||||
|
||||
candidate.manifestProperties[KLIB_PROPERTY_IR_PROVIDER]?.let {
|
||||
candidate.irProviderName?.let {
|
||||
if (it !in knownIrProviders) {
|
||||
logger.warning("skipping $candidatePath. The library requires unknown IR provider $it.")
|
||||
return false
|
||||
|
||||
Reference in New Issue
Block a user