From e84ab4abfe2612d215e7cb6df4fffda24e921aa6 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Fri, 13 Oct 2017 14:55:25 +0300
Subject: [PATCH] Change manifest 'dependencies' field for 'depends'. To reduce
 user confusion on reading manifests.

---
 .../backend/konan/library/impl/KonanLibraryReaderImpl.kt  | 2 +-
 .../backend/konan/library/impl/KonanLibraryWriterImpl.kt  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt
index 7998c61bab4..cc4ccac33aa 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt
@@ -69,7 +69,7 @@ class LibraryReaderImpl(var libraryFile: File, val currentAbiVersion: Int,
         get() = manifestProperties.propertyList("linkerOpts", target!!.detailedName)
 
     override val unresolvedDependencies: List<String>
-        get() = manifestProperties.propertyList("dependencies")
+        get() = manifestProperties.propertyList("depends")
 
     val resolvedDependencies = mutableListOf<LibraryReaderImpl>()
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryWriterImpl.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryWriterImpl.kt
index 98195539866..428432845f0 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryWriterImpl.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryWriterImpl.kt
@@ -86,8 +86,12 @@ class LibraryWriterImpl(override val libDir: File, moduleName: String, currentAb
     }
 
     override fun addLinkDependencies(libraries: List<KonanLibraryReader>) {
-        if (libraries.isEmpty()) return
-        manifestProperties.setProperty("dependencies", libraries .map { it.uniqueName } . joinToString(" "))
+        if (libraries.isEmpty()) {
+            // make sure there are not leftovers from the .def file.
+            manifestProperties.remove("depends") 
+        } else {
+            manifestProperties.setProperty("depends", libraries .map { it.uniqueName } . joinToString(" "))
+        }
     }
 
     override fun addManifestAddend(path: String) {