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

KLIB: Avoid check for KLIBs w/o components for other platforms than Native

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-03-23 20:17:48 +07:00
parent ad1a1ac49a
commit e81479e30b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/utils.kt
+6 -2
View File
@@ -40,9 +40,13 @@ fun VirtualFile.isKlibLibraryRootForPlatform(targetPlatform: TargetPlatform): Bo
// run check for library root too // run check for library root too
// this is necessary to recognize old style KLIBs that do not have components, and report tem to user appropriately // this is necessary to recognize old style KLIBs that do not have components, and report tem to user appropriately
// (relevant only for Kotlin/Native KLIBs)
val requestedBuiltInsPlatform = targetPlatform.toBuiltInsPlatform() val requestedBuiltInsPlatform = targetPlatform.toBuiltInsPlatform()
return checkKlibComponent(this, requestedBuiltInsPlatform) || if (requestedBuiltInsPlatform == BuiltInsPlatform.NATIVE && checkKlibComponent(this, requestedBuiltInsPlatform)) {
children?.any { checkKlibComponent(it, requestedBuiltInsPlatform) } == true return true
}
return children?.any { checkKlibComponent(it, requestedBuiltInsPlatform) } == true
} }
private fun checkKlibComponent(componentFile: VirtualFile, requestedBuiltInsPlatform: BuiltInsPlatform): Boolean { private fun checkKlibComponent(componentFile: VirtualFile, requestedBuiltInsPlatform: BuiltInsPlatform): Boolean {