From 65fdf3c42e196ea5b1726d0ad139330c7b589476 Mon Sep 17 00:00:00 2001 From: Ryan Loebs Date: Sat, 24 Jul 2021 17:35:25 -0700 Subject: [PATCH] Add linuxArm32Hfp and linuxArm64 build targets --- gradle/compile-native-multiplatform.gradle | 2 ++ kotlinx-coroutines-core/build.gradle | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gradle/compile-native-multiplatform.gradle b/gradle/compile-native-multiplatform.gradle index 73e99e8465..756225b35c 100644 --- a/gradle/compile-native-multiplatform.gradle +++ b/gradle/compile-native-multiplatform.gradle @@ -14,6 +14,8 @@ kotlin { targets { addTarget(presets.linuxX64) + addTarget(presets.linuxArm32Hfp) + addTarget(presets.linuxArm64) addTarget(presets.iosArm64) addTarget(presets.iosArm32) addTarget(presets.iosX64) diff --git a/kotlinx-coroutines-core/build.gradle b/kotlinx-coroutines-core/build.gradle index c45ca08cef..2583ee37a2 100644 --- a/kotlinx-coroutines-core/build.gradle +++ b/kotlinx-coroutines-core/build.gradle @@ -96,8 +96,10 @@ kotlin { freeCompilerArgs += ["-e", "kotlinx.coroutines.mainBackground"] } } - testRuns { - background { setExecutionSourceFrom(binaries.backgroundDebugTest) } + if (!(it instanceof org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget) || (it instanceof org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTests)) { + testRuns { + background { setExecutionSourceFrom(binaries.backgroundDebugTest) } + } } } }