From 26ccdbdc182efe6761d16789183845fcd67de33a Mon Sep 17 00:00:00 2001 From: LepilkinaElena Date: Sun, 1 Nov 2020 09:06:01 +0300 Subject: [PATCH] Used lazy value of base class not to load properties from manifest twice (#4487) --- .../jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt index 87b74b05d20..be0b9207369 100644 --- a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt +++ b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt @@ -42,9 +42,7 @@ open class TargetedLibraryImpl( } override val manifestProperties: Properties by lazy { - val properties = access.inPlace { - it.manifestFile.loadProperties() - } + val properties = base.manifestProperties target?.let { substitute(properties, defaultTargetSubstitutions(it)) } properties }