[Gradle] Fix CInterop commonization for included builds

KT-58471 Verification Pending

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTaskInputs.kt

@@ -82,7 +82,7 @@ internal class MetadataDependencyTransformationTaskInputs(
 private fun Configuration.withoutProjectDependencies(): FileCollection {
     return incoming.artifactView { view ->
         view.componentFilter { componentIdentifier ->
-            componentIdentifier !is ProjectComponentIdentifier
+            componentIdentifier !is ProjectComponentIdentifier || !componentIdentifier.build.isCurrentBuild
         }
     }.files
 }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt

@@ -197,7 +197,14 @@ internal open class CInteropMetadataDependencyTransformationTask @Inject constru
 
     private fun Iterable<MetadataDependencyResolution>.resolutionsToTransform(): List<ChooseVisibleSourceSets> {
         return filterIsInstance<ChooseVisibleSourceSets>()
-            .applyIf(skipProjectDependencies) { filter { it.dependency.id !is ProjectComponentIdentifier } }
+            .applyIf(skipProjectDependencies) {
+                filterNot {
+                    val dependencyId = it.dependency.id
+                    // filter out ProjectDependencies but keep the ones which are coming from included builds
+                    // i.e. they are ProjectDependencies but have isCurrentBuild = false
+                    dependencyId is ProjectComponentIdentifier && dependencyId.build.isCurrentBuild
+                }
+            }
     }
 }