diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt index 5c399c9f79a..c62969d54de 100644 --- a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt @@ -117,6 +117,7 @@ class KotlinLibraryResolverImpl( newDependencies = newDependencies.map { library: KotlinResolvedLibraryImpl -> library.library.unresolvedDependencies.asSequence() + .filterNot { searchPathResolver.isProvidedByDefault(it) } .map { KotlinResolvedLibraryImpl(searchPathResolver.resolve(it)) } .map { resolved -> val absoluteFile = resolved.library.libraryFile.absoluteFile diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt index a1f29b59e85..87628f755d0 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt @@ -15,6 +15,7 @@ interface SearchPathResolver : WithLogger { fun resolve(givenPath: String): L fun defaultLinks(noStdLib: Boolean, noDefaultLibs: Boolean, noEndorsedLibs: Boolean): List fun libraryMatch(candidate: L, unresolved: UnresolvedLibrary): Boolean + fun isProvidedByDefault(unresolved: UnresolvedLibrary): Boolean = false } interface SearchPathResolverWithAttributes: SearchPathResolver {