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

Gradle, native: Embed bitcode for watchOS and tvOS

Browse Source
This commit is contained in:
Ilya Matveev
2019-09-19 14:53:14 +07:00
parent 2819ab4ae9
commit 1b64583855
2 changed files with 13 additions and 8 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
+1 -6
View File
@@ -215,12 +215,7 @@ class Framework(
/** /**
* Embed bitcode for the framework or not. See [BitcodeEmbeddingMode]. * Embed bitcode for the framework or not. See [BitcodeEmbeddingMode].
*/ */
var embedBitcode: BitcodeEmbeddingMode = var embedBitcode: BitcodeEmbeddingMode = buildType.embedBitcode(target.konanTarget)
if (target.konanTarget == KonanTarget.IOS_ARM64 || target.konanTarget == KonanTarget.IOS_ARM32) {
buildType.iosEmbedBitcode
} else {
BitcodeEmbeddingMode.DISABLE
}
/** /**
* Enable or disable embedding bitcode for the framework. See [BitcodeEmbeddingMode]. * Enable or disable embedding bitcode for the framework. See [BitcodeEmbeddingMode].
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaryTypes.kt
+12 -2
View File
@@ -3,20 +3,30 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Named import org.gradle.api.Named
import org.jetbrains.kotlin.gradle.plugin.mpp.Framework.BitcodeEmbeddingMode import org.jetbrains.kotlin.gradle.plugin.mpp.Framework.BitcodeEmbeddingMode
import org.jetbrains.kotlin.konan.target.Architecture.ARM32
import org.jetbrains.kotlin.konan.target.Architecture.ARM64
import org.jetbrains.kotlin.konan.target.CompilerOutputKind import org.jetbrains.kotlin.konan.target.CompilerOutputKind
import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.Family.*
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
enum class NativeBuildType( enum class NativeBuildType(
val optimized: Boolean, val optimized: Boolean,
val debuggable: Boolean, val debuggable: Boolean,
internal val iosEmbedBitcode: BitcodeEmbeddingMode private val embedBitcodeForAppleDevices: BitcodeEmbeddingMode
) : Named { ) : Named {
RELEASE(true, false, BitcodeEmbeddingMode.BITCODE), RELEASE(true, false, BitcodeEmbeddingMode.BITCODE),
DEBUG(false, true, BitcodeEmbeddingMode.MARKER); DEBUG(false, true, BitcodeEmbeddingMode.MARKER);
override fun getName(): String = name.toLowerCase() override fun getName(): String = name.toLowerCase()
fun embedBitcode(target: KonanTarget) = with(target) {
if (family in listOf(IOS, WATCHOS, TVOS) && architecture in listOf(ARM32, ARM64)) {
embedBitcodeForAppleDevices
} else {
BitcodeEmbeddingMode.DISABLE
}
}
companion object { companion object {
val DEFAULT_BUILD_TYPES = setOf(DEBUG, RELEASE) val DEFAULT_BUILD_TYPES = setOf(DEBUG, RELEASE)
} }