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

[Commonizer] Log commonization only for really present targets

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-02-18 14:07:31 +03:00
parent 3ad7b60747
commit 496aad3c4a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt
+2 -1
View File
@@ -106,6 +106,7 @@ internal class NativeDistributionCommonize(options: Collection<Option<*>>) : Tas
val logger = CliLoggerAdapter(2) val logger = CliLoggerAdapter(2)
val libraryLoader = DefaultNativeLibraryLoader(logger) val libraryLoader = DefaultNativeLibraryLoader(logger)
val repository = KonanDistributionRepository(distribution, commonizerTargets.toSet(), libraryLoader) val repository = KonanDistributionRepository(distribution, commonizerTargets.toSet(), libraryLoader)
val existingTargets = commonizerTargets.filter { repository.getLibraries(it).isNotEmpty() }.toSet()
val statsCollector = StatsCollector(statsType, commonizerTargets) val statsCollector = StatsCollector(statsType, commonizerTargets)
val resultsConsumer = buildResultsConsumer { val resultsConsumer = buildResultsConsumer {
@@ -115,7 +116,7 @@ internal class NativeDistributionCommonize(options: Collection<Option<*>>) : Tas
) )
if (copyStdlib) this add CopyStdlibResultsConsumer(distribution, destination, logger.toProgressLogger()) if (copyStdlib) this add CopyStdlibResultsConsumer(distribution, destination, logger.toProgressLogger())
if (copyEndorsedLibs) this add CopyEndorsedLibrairesResultsConsumer(distribution, destination, logger.toProgressLogger()) if (copyEndorsedLibs) this add CopyEndorsedLibrairesResultsConsumer(distribution, destination, logger.toProgressLogger())
this add LoggingResultsConsumer(SharedCommonizerTarget(commonizerTargets.toSet()), logger.toProgressLogger()) this add LoggingResultsConsumer(SharedCommonizerTarget(existingTargets), logger.toProgressLogger())
} }
val targetNames = commonizerTargets.joinToString { it.prettyName } val targetNames = commonizerTargets.joinToString { it.prettyName }