KLIB: Merge manifest for endorsed libs produced for different targets
(cherry picked from commit 99f0ab739d448857cf4bd29793ae71d31e0eee93)
This commit is contained in:
committed by
Vasily Levchenko
parent
bf9c66e275
commit
a99faec6b4
@@ -1,3 +1,4 @@
|
|||||||
|
import org.jetbrains.kotlin.UtilsKt
|
||||||
import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask
|
import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
@@ -36,11 +37,22 @@ targetList.each { target ->
|
|||||||
endorsedLibrariesList.each { library ->
|
endorsedLibrariesList.each { library ->
|
||||||
dependsOn "$library:${target}${ toTaskName(library) }"
|
dependsOn "$library:${target}${ toTaskName(library) }"
|
||||||
}
|
}
|
||||||
|
|
||||||
destinationDir project.buildDir
|
destinationDir project.buildDir
|
||||||
|
|
||||||
endorsedLibrariesList.each { library ->
|
endorsedLibrariesList.each { library ->
|
||||||
from(project("$library").file("build/${target}${ toTaskName(library) }")) {
|
from(project("$library").file("build/${target}${ toTaskName(library) }")) {
|
||||||
include('**')
|
include('**')
|
||||||
into("${library.replaceAll("\\.", "-")}")
|
into("${library.replaceAll("\\.", "-")}")
|
||||||
|
eachFile {
|
||||||
|
if (name == 'manifest') {
|
||||||
|
def existingManifest = file("$destinationDir/$path")
|
||||||
|
if (existingManifest.exists()) {
|
||||||
|
UtilsKt.mergeManifestsByTargets(project, file, existingManifest)
|
||||||
|
exclude()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user