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

Add support for android and wasm on macos_arm64

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-03-23 19:05:48 +07:00
committed by TeamCityServer
parent 3a008f6236
commit 5243720043
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/konan/konan.properties
+21
View File
@@ -669,6 +669,10 @@ targetToolchain.macos_x64-android_arm32 = target-toolchain-2-osx-android_ndk
dependencies.macos_x64-android_arm32 = \ dependencies.macos_x64-android_arm32 = \
target-sysroot-1-android_ndk \ target-sysroot-1-android_ndk \
target-toolchain-2-osx-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 targetToolchain.linux_x64-android_arm32 = target-toolchain-2-linux-android_ndk
dependencies.linux_x64-android_arm32 = \ dependencies.linux_x64-android_arm32 = \
target-sysroot-1-android_ndk \ 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 = \ dependencies.macos_x64-android_arm64 = \
target-sysroot-1-android_ndk \ target-sysroot-1-android_ndk \
target-toolchain-2-osx-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 targetToolchain.linux_x64-android_arm64 = target-toolchain-2-linux-android_ndk
dependencies.linux_x64-android_arm64 = \ dependencies.linux_x64-android_arm64 = \
target-sysroot-1-android_ndk \ 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 = \ dependencies.macos_x64-android_x86 = \
target-sysroot-1-android_ndk \ target-sysroot-1-android_ndk \
target-toolchain-2-osx-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 targetToolchain.linux_x64-android_x86 = target-toolchain-2-linux-android_ndk
dependencies.linux_x64-android_x86 = \ dependencies.linux_x64-android_x86 = \
target-sysroot-1-android_ndk \ 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 = \ dependencies.macos_x64-android_x64 = \
target-sysroot-1-android_ndk \ target-sysroot-1-android_ndk \
target-toolchain-2-osx-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 targetToolchain.linux_x64-android_x64 = target-toolchain-2-linux-android_ndk
dependencies.linux_x64-android_x64 = \ dependencies.linux_x64-android_x64 = \
target-sysroot-1-android_ndk \ target-sysroot-1-android_ndk \
@@ -841,6 +857,11 @@ dependencies.macos_x64-wasm32 = \
target-sysroot-4-embedded \ target-sysroot-4-embedded \
target-toolchain-3-macos-wasm 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 targetToolchain.linux_x64-wasm32 = target-toolchain-2-linux-wasm
dependencies.linux_x64-wasm32 = \ dependencies.linux_x64-wasm32 = \
target-sysroot-4-embedded \ target-sysroot-4-embedded \
native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
+6 -1
View File
@@ -106,7 +106,12 @@ open class HostManager(
TVOS_X64, TVOS_X64,
LINUX_X64, LINUX_X64,
LINUX_ARM32_HFP, LINUX_ARM32_HFP,
LINUX_ARM64 LINUX_ARM64,
ANDROID_X86,
ANDROID_X64,
ANDROID_ARM32,
ANDROID_ARM64,
WASM32
) )
) )