diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index 2cc48caff27..e5ec51711d6 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -669,6 +669,10 @@ targetToolchain.macos_x64-android_arm32 = target-toolchain-2-osx-android_ndk dependencies.macos_x64-android_arm32 = \ target-sysroot-1-android_ndk \ target-toolchain-2-osx-android_ndk +targetToolchain.macos_arm64-android_arm32 = target-toolchain-2-osx-android_ndk +dependencies.macos_arm64-android_arm32 = \ + target-sysroot-1-android_ndk \ + target-toolchain-2-osx-android_ndk targetToolchain.linux_x64-android_arm32 = target-toolchain-2-linux-android_ndk dependencies.linux_x64-android_arm32 = \ target-sysroot-1-android_ndk \ @@ -695,6 +699,10 @@ targetToolchain.macos_x64-android_arm64 = target-toolchain-2-osx-android_ndk dependencies.macos_x64-android_arm64 = \ target-sysroot-1-android_ndk \ target-toolchain-2-osx-android_ndk +targetToolchain.macos_arm64-android_arm64 = target-toolchain-2-osx-android_ndk +dependencies.macos_arm64-android_arm64 = \ + target-sysroot-1-android_ndk \ + target-toolchain-2-osx-android_ndk targetToolchain.linux_x64-android_arm64 = target-toolchain-2-linux-android_ndk dependencies.linux_x64-android_arm64 = \ target-sysroot-1-android_ndk \ @@ -720,6 +728,10 @@ targetToolchain.macos_x64-android_x86 = target-toolchain-2-osx-android_ndk dependencies.macos_x64-android_x86 = \ target-sysroot-1-android_ndk \ target-toolchain-2-osx-android_ndk +targetToolchain.macos_arm64-android_x86 = target-toolchain-2-osx-android_ndk +dependencies.macos_arm64-android_x86 = \ + target-sysroot-1-android_ndk \ + target-toolchain-2-osx-android_ndk targetToolchain.linux_x64-android_x86 = target-toolchain-2-linux-android_ndk dependencies.linux_x64-android_x86 = \ target-sysroot-1-android_ndk \ @@ -749,6 +761,10 @@ targetToolchain.macos_x64-android_x64 = target-toolchain-2-osx-android_ndk dependencies.macos_x64-android_x64 = \ target-sysroot-1-android_ndk \ target-toolchain-2-osx-android_ndk +targetToolchain.macos_arm64-android_x64 = target-toolchain-2-osx-android_ndk +dependencies.macos_arm64-android_x64 = \ + target-sysroot-1-android_ndk \ + target-toolchain-2-osx-android_ndk targetToolchain.linux_x64-android_x64 = target-toolchain-2-linux-android_ndk dependencies.linux_x64-android_x64 = \ target-sysroot-1-android_ndk \ @@ -841,6 +857,11 @@ dependencies.macos_x64-wasm32 = \ target-sysroot-4-embedded \ target-toolchain-3-macos-wasm +targetToolchain.macos_arm64-wasm32 = target-toolchain-3-macos-wasm +dependencies.macos_arm64-wasm32 = \ + target-sysroot-4-embedded \ + target-toolchain-3-macos-wasm + targetToolchain.linux_x64-wasm32 = target-toolchain-2-linux-wasm dependencies.linux_x64-wasm32 = \ target-sysroot-4-embedded \ diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt index 3f90b9e6355..93b4c3051f9 100644 --- a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt +++ b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt @@ -106,7 +106,12 @@ open class HostManager( TVOS_X64, LINUX_X64, LINUX_ARM32_HFP, - LINUX_ARM64 + LINUX_ARM64, + ANDROID_X86, + ANDROID_X64, + ANDROID_ARM32, + ANDROID_ARM64, + WASM32 ) )