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

Add new native targets. (#2538)

Browse Source
This commit is contained in:
Nikolay Igotti
2019-08-23 16:11:40 +03:00
committed by GitHub
parent 64d4cca589
commit fcb0b1b5eb
4 changed files with 99 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
konan/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
+17 -2
View File
@@ -32,11 +32,16 @@ enum class Architecture(val bitness: Int) {
}
sealed class KonanTarget(override val name: String, val family: Family, val architecture: Architecture) : Named {
object ANDROID_X64 : KonanTarget( "android_x64", Family.ANDROID, Architecture.X64)
object ANDROID_ARM32 : KonanTarget( "android_arm32", Family.ANDROID, Architecture.ARM32)
object ANDROID_ARM64 : KonanTarget( "android_arm64", Family.ANDROID, Architecture.ARM64)
object IOS_ARM32 : KonanTarget( "ios_arm32", Family.IOS, Architecture.ARM32)
object IOS_ARM64 : KonanTarget( "ios_arm64", Family.IOS, Architecture.ARM64)
object IOS_X64 : KonanTarget( "ios_x64", Family.IOS, Architecture.X64)
object WATCHOS_ARM64 : KonanTarget( "watchos_arm64", Family.IOS, Architecture.ARM64)
object WATCHOS_X64 : KonanTarget( "watchos_x64", Family.IOS, Architecture.X64)
object TVOS_ARM64 : KonanTarget( "tvos_arm64", Family.IOS, Architecture.ARM64)
object TVOS_X64 : KonanTarget( "tvos_x64", Family.IOS, Architecture.X64)
object LINUX_X64 : KonanTarget( "linux_x64", Family.LINUX, Architecture.X64)
object MINGW_X86 : KonanTarget( "mingw_x86", Family.MINGW, Architecture.X86)
object MINGW_X64 : KonanTarget( "mingw_x64", Family.MINGW, Architecture.X64)
@@ -122,9 +127,11 @@ open class HostManager(protected val distribution: Distribution = Distribution()
// TODO: need a better way to enumerated predefined targets.
private val predefinedTargets = listOf(
ANDROID_ARM32, ANDROID_ARM64,
ANDROID_ARM32, ANDROID_ARM64, ANDROID_X64,
IOS_ARM32, IOS_ARM64, IOS_X64,
LINUX_X64, LINUX_ARM32_HFP, LINUX_ARM64, LINUX_MIPS32, LINUX_MIPSEL32,
WATCHOS_ARM64, WATCHOS_X64,
TVOS_ARM64, TVOS_X64,
LINUX_X64, LINUX_ARM32_HFP, LINUX_ARM64, LINUX_MIPS32, LINUX_MIPSEL32,
MINGW_X64, MINGW_X86,
MACOS_X64,
WASM32)
@@ -169,6 +176,7 @@ open class HostManager(protected val distribution: Distribution = Distribution()
LINUX_ARM64,
LINUX_MIPS32,
LINUX_MIPSEL32,
ANDROID_X64,
ANDROID_ARM32,
ANDROID_ARM64,
WASM32
@@ -179,6 +187,7 @@ open class HostManager(protected val distribution: Distribution = Distribution()
LINUX_X64,
LINUX_ARM32_HFP,
LINUX_ARM64,
ANDROID_X64,
ANDROID_ARM32,
ANDROID_ARM64,
WASM32
@@ -188,9 +197,14 @@ open class HostManager(protected val distribution: Distribution = Distribution()
IOS_ARM32,
IOS_ARM64,
IOS_X64,
WATCHOS_ARM64,
WATCHOS_X64,
TVOS_ARM64,
TVOS_X64,
LINUX_X64,
LINUX_ARM32_HFP,
LINUX_ARM64,
ANDROID_X64,
ANDROID_ARM32,
ANDROID_ARM64,
WASM32
@@ -317,6 +331,7 @@ val KonanTarget.presetName: String
get() = when (this) {
ANDROID_ARM32 -> "androidNativeArm32"
ANDROID_ARM64 -> "androidNativeArm64"
ANDROID_X64 -> "androidNativeX64"
else -> evaluatePresetName(this.name)
}