diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt index 97e155c076d..79a9d2b6673 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt @@ -219,7 +219,17 @@ private fun KotlinTargetComponent.findUsageContext(configurationName: String): U return usageContexts.find { usageContext -> if (usageContext !is KotlinUsageContext) return@find false val compilation = usageContext.compilation - configurationName == compilation.target.apiElementsConfigurationName || - configurationName == compilation.target.runtimeElementsConfigurationName + val outgoingConfigurations = mutableListOf( + compilation.target.apiElementsConfigurationName, + compilation.target.runtimeElementsConfigurationName + ) + if (compilation is KotlinJvmAndroidCompilation) { + val androidVariant = compilation.androidVariant + outgoingConfigurations += listOf( + "${androidVariant.name}ApiElements", + "${androidVariant.name}RuntimeElements", + ) + } + configurationName in outgoingConfigurations } } \ No newline at end of file