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

[Gradle, K/N] Make BitcodeEmbeddingMode move backward compatible

Browse Source
This commit is contained in:
Alexander Likhachev
2021-02-14 11:51:18 +03:00
parent cbeb031099
commit 383b9834a1
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
+10 -4
View File
@@ -244,12 +244,12 @@ class Framework(
/** /**
* Embed bitcode for the framework or not. See [BitcodeEmbeddingMode]. * Embed bitcode for the framework or not. See [BitcodeEmbeddingMode].
*/ */
var embedBitcode: BitcodeEmbeddingMode = buildType.embedBitcode(konanTarget) var embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode = buildType.embedBitcode(konanTarget)
/** /**
* Enable or disable embedding bitcode for the framework. See [BitcodeEmbeddingMode]. * Enable or disable embedding bitcode for the framework. See [BitcodeEmbeddingMode].
*/ */
fun embedBitcode(mode: BitcodeEmbeddingMode) { fun embedBitcode(mode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode) {
embedBitcode = mode embedBitcode = mode
} }
@@ -263,15 +263,21 @@ class Framework(
* marker - Embed placeholder LLVM IR data as a marker. * marker - Embed placeholder LLVM IR data as a marker.
* Has the same effect as the -Xembed-bitcode-marker command line option. * Has the same effect as the -Xembed-bitcode-marker command line option.
*/ */
fun embedBitcode(mode: String) = embedBitcode(BitcodeEmbeddingMode.valueOf(mode.toUpperCase())) fun embedBitcode(mode: String) = embedBitcode(org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.valueOf(mode.toUpperCase()))
/** /**
* Specifies if the framework is linked as a static library (false by default). * Specifies if the framework is linked as a static library (false by default).
*/ */
var isStatic = false var isStatic = false
object BitcodeEmbeddingMode {
val DISABLE = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.DISABLE
val BITCODE = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.BITCODE
val MARKER = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.MARKER
}
companion object { companion object {
val frameworkTargets = Attribute.of( val frameworkTargets: Attribute<Set<*>> = Attribute.of(
"org.jetbrains.kotlin.native.framework.targets", "org.jetbrains.kotlin.native.framework.targets",
Set::class.java Set::class.java
) )
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+2 -2
View File
@@ -590,8 +590,8 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
addKey("-tr", processTests) addKey("-tr", processTests)
addArgIfNotNull("-entry", entryPoint) addArgIfNotNull("-entry", entryPoint)
when (embedBitcode) { when (embedBitcode) {
BitcodeEmbeddingMode.MARKER -> add("-Xembed-bitcode-marker") Framework.BitcodeEmbeddingMode.MARKER -> add("-Xembed-bitcode-marker")
BitcodeEmbeddingMode.BITCODE -> add("-Xembed-bitcode") Framework.BitcodeEmbeddingMode.BITCODE -> add("-Xembed-bitcode")
else -> { /* Do nothing. */ else -> { /* Do nothing. */
} }
} }