From 14161c825072af8702af6fd043a173fc08fd1164 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Fri, 9 Apr 2021 10:26:54 +0200 Subject: [PATCH] [Commonizer] Prevent copying missing modules that are already present in destination --- .../kotlin/commonizer/konan/ModuleSerializer.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/ModuleSerializer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/ModuleSerializer.kt index 7e8135097f9..6637f2187c2 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/ModuleSerializer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/ModuleSerializer.kt @@ -5,7 +5,9 @@ package org.jetbrains.kotlin.commonizer.konan -import org.jetbrains.kotlin.commonizer.* +import org.jetbrains.kotlin.commonizer.CommonizerOutputLayout +import org.jetbrains.kotlin.commonizer.CommonizerTarget +import org.jetbrains.kotlin.commonizer.ResultsConsumer import org.jetbrains.kotlin.library.SerializedMetadata import org.jetbrains.kotlin.library.impl.BaseWriterImpl import org.jetbrains.kotlin.library.impl.BuiltInsPlatform @@ -25,8 +27,11 @@ internal class ModuleSerializer( writeLibrary(moduleResult.metadata, moduleResult.manifest, libraryDestination) } is ResultsConsumer.ModuleResult.Missing -> { - val missingModuleLocation = moduleResult.originalLocation - missingModuleLocation.copyRecursively(librariesDestination.resolve(moduleResult.fileSystemCompatibleLibraryName)) + val missingModuleSourceLocation = moduleResult.originalLocation + val missingModuleDestinationLocation = librariesDestination.resolve(moduleResult.fileSystemCompatibleLibraryName) + if (!missingModuleDestinationLocation.exists()) { + missingModuleSourceLocation.copyRecursively(librariesDestination.resolve(moduleResult.fileSystemCompatibleLibraryName)) + } } } }