From a99faec6b4db61ff15e46269f07eb8145450c45b Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Mon, 6 Apr 2020 12:18:25 +0700
Subject: [PATCH] KLIB: Merge manifest for endorsed libs produced for different
 targets

(cherry picked from commit 99f0ab739d448857cf4bd29793ae71d31e0eee93)
---
 endorsedLibraries/build.gradle | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/endorsedLibraries/build.gradle b/endorsedLibraries/build.gradle
index 4e517d1a258..197de076e04 100644
--- a/endorsedLibraries/build.gradle
+++ b/endorsedLibraries/build.gradle
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.UtilsKt
 import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask
 
 buildscript {
@@ -36,11 +37,22 @@ targetList.each { target ->
         endorsedLibrariesList.each { library ->
             dependsOn "$library:${target}${ toTaskName(library) }"
         }
+
         destinationDir project.buildDir
+
         endorsedLibrariesList.each { library ->
             from(project("$library").file("build/${target}${ toTaskName(library) }")) {
                 include('**')
                 into("${library.replaceAll("\\.", "-")}")
+                eachFile {
+                    if (name == 'manifest') {
+                        def existingManifest = file("$destinationDir/$path")
+                        if (existingManifest.exists()) {
+                            UtilsKt.mergeManifestsByTargets(project, file, existingManifest)
+                            exclude()
+                        }
+                    }
+                }
             }
         }
     }