diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibResolvedModuleDescriptorsFactory.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibResolvedModuleDescriptorsFactory.kt index 56fec97a835..cf620d2d55b 100644 --- a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibResolvedModuleDescriptorsFactory.kt +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibResolvedModuleDescriptorsFactory.kt @@ -29,7 +29,8 @@ interface KlibResolvedModuleDescriptorsFactory { storageManager: StorageManager, builtIns: KotlinBuiltIns?, languageVersionSettings: LanguageVersionSettings, - customAction: ((KotlinLibrary, ModuleDescriptorImpl) -> Unit)? = null + customAction: ((KotlinLibrary, ModuleDescriptorImpl) -> Unit)? = null, + additionalDependencyModules: Iterable ): KotlinResolvedModuleDescriptors } diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt index ad58d39464e..165365e67cd 100644 --- a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt @@ -37,7 +37,8 @@ class KlibResolvedModuleDescriptorsFactoryImpl( storageManager: StorageManager, builtIns: KotlinBuiltIns?, languageVersionSettings: LanguageVersionSettings, - customAction: ((KotlinLibrary, ModuleDescriptorImpl) -> Unit)? + customAction: ((KotlinLibrary, ModuleDescriptorImpl) -> Unit)?, + additionalDependencyModules: Iterable ): KotlinResolvedModuleDescriptors { val moduleDescriptors = mutableListOf() @@ -64,7 +65,7 @@ class KlibResolvedModuleDescriptorsFactoryImpl( // Set inter-dependencies between module descriptors, add forwarding declarations module. for (module in moduleDescriptors) { // Yes, just to all of them. - module.setDependencies(moduleDescriptors + forwardDeclarationsModule) + module.setDependencies(moduleDescriptors + additionalDependencyModules + forwardDeclarationsModule) } return KotlinResolvedModuleDescriptors(moduleDescriptors, forwardDeclarationsModule)