Be more tolerant to non-existing paths in library reader. (#1511)

This commit is contained in:
Nikolay Igotti
2018-04-18 11:47:58 +01:00
committed by GitHub
parent 0c909fea6a
commit 688b3f26f2
2 changed files with 5 additions and 2 deletions
@@ -60,10 +60,11 @@ class LibraryReaderImpl(var libraryFile: File, val currentAbiVersion: Int,
get() = manifestProperties.propertyString("unique_name")!!
override val bitcodePaths: List<String>
get() = (realFiles.kotlinDir.listFiles + realFiles.nativeDir.listFiles).map{it.absolutePath}
get() = (realFiles.kotlinDir.listFilesOrEmpty + realFiles.nativeDir.listFilesOrEmpty)
.map { it.absolutePath }
override val includedPaths: List<String>
get() = (realFiles.includedDir.listFiles).map{it.absolutePath}
get() = (realFiles.includedDir.listFilesOrEmpty).map { it.absolutePath }
override val linkerOpts: List<String>
get() = manifestProperties.propertyList("linkerOpts", target!!.visibleName)
@@ -52,6 +52,8 @@ data class File constructor(internal val javaPath: Path) {
get() = javaPath.isAbsolute()
val listFiles: List<File>
get() = Files.newDirectoryStream(javaPath).use { stream -> stream.map { File(it) } }
val listFilesOrEmpty: List<File>
get() = if (exists) listFiles else emptyList()
fun child(name: String) = File(this, name)