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

Add IOS_ARM32 swift target

Browse Source 
Small reformat
This commit is contained in:
Pavel Punegov
2020-07-15 17:59:15 +03:00
committed by Pavel Punegov
parent 3169e3c857
commit 12665825b9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
+6 -1
View File
@@ -318,7 +318,12 @@ private fun sshExecutor(project: Project): ExecutorService = object : ExecutorSe
} }
} }
internal data class DeviceTarget(@Expose val name: String, @Expose val udid: String, @Expose val state: String, @Expose val type: String) internal data class DeviceTarget(
@Expose val name: String,
@Expose val udid: String,
@Expose val state: String,
@Expose val type: String
)
private fun deviceLauncher(project: Project) = object : ExecutorService { private fun deviceLauncher(project: Project) = object : ExecutorService {
private val xcProject = Paths.get(project.testOutputRoot, "launcher") private val xcProject = Paths.get(project.testOutputRoot, "launcher")
build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+1
View File
@@ -237,6 +237,7 @@ fun compileSwift(project: Project, target: KonanTarget, sources: List<String>, o
val swiftTarget = when (target) { val swiftTarget = when (target) {
KonanTarget.IOS_X64 -> "x86_64-apple-ios" + configs.osVersionMin KonanTarget.IOS_X64 -> "x86_64-apple-ios" + configs.osVersionMin
KonanTarget.IOS_ARM32 -> "armv7-apple-ios" + configs.osVersionMin
KonanTarget.IOS_ARM64 -> "arm64-apple-ios" + configs.osVersionMin KonanTarget.IOS_ARM64 -> "arm64-apple-ios" + configs.osVersionMin
KonanTarget.TVOS_X64 -> "x86_64-apple-tvos" + configs.osVersionMin KonanTarget.TVOS_X64 -> "x86_64-apple-tvos" + configs.osVersionMin
KonanTarget.TVOS_ARM64 -> "arm64-apple-tvos" + configs.osVersionMin KonanTarget.TVOS_ARM64 -> "arm64-apple-tvos" + configs.osVersionMin