Merge tag 'v0.8.19'

silenium-dev · Jan 7, 2025 · 82b2111 · 82b2111
2 parents 31c2f6d + dbc6bdb
commit 82b2111
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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<String> {
         )
         OS.Wasm -> mutableListOf<String>().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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up @@
                         "-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(
@@ Expand Down @@