From 91be42c86b87f7693656da4a319534e86721c032 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Karpovich" Date: Tue, 3 Dec 2024 10:42:00 +0100 Subject: [PATCH] Build skiko.wasm with -s SUPPORT_LONGJMP=wasm --- .../main/kotlin/tasks/configuration/CommonTasksConfiguration.kt | 2 +- .../main/kotlin/tasks/configuration/WasmTasksConfiguration.kt | 2 +- skiko/gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/skiko/buildSrc/src/main/kotlin/tasks/configuration/CommonTasksConfiguration.kt b/skiko/buildSrc/src/main/kotlin/tasks/configuration/CommonTasksConfiguration.kt index ee1ca75e72..160b317c09 100644 --- a/skiko/buildSrc/src/main/kotlin/tasks/configuration/CommonTasksConfiguration.kt +++ b/skiko/buildSrc/src/main/kotlin/tasks/configuration/CommonTasksConfiguration.kt @@ -98,7 +98,7 @@ fun skiaPreprocessorFlags(os: OS, buildType: SkiaBuildType): Array { ) OS.Wasm -> mutableListOf().apply { add("-DSKIKO_WASM") - // add("-sSUPPORT_LONGJMP=wasm") // TODO(o.karpovich): enable when skia is built with this flag (CMP-6628) + add("-sSUPPORT_LONGJMP=wasm") } OS.Android -> listOf( "-DSK_BUILD_FOR_ANDROID" diff --git a/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt b/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt index 041d4b331e..b73e685bd4 100644 --- a/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt +++ b/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt @@ -118,7 +118,7 @@ fun SkikoProjectContext.createWasmLinkTasks(): LinkWasmTasks = with(this.project "-O2" ) ) - // addAll(listOf("-s", "SUPPORT_LONGJMP=wasm")) // TODO(o.karpovich): enable when skia is built with this flag (CMP-6628) + addAll(listOf("-s", "SUPPORT_LONGJMP=wasm")) if (outputES6) { addAll( listOf( diff --git a/skiko/gradle.properties b/skiko/gradle.properties index 0c306e64ee..e23fa5b09f 100644 --- a/skiko/gradle.properties +++ b/skiko/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official deploy.version=0.0.0 -dependencies.skia=m126-6bfb13368b +dependencies.skia=m126-6fd3120c1b # you can override general skia dependencies by passing platform-specific property: # dependencies.skia.android-arm64