Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build skiko.wasm with -s SUPPORT_LONGJMP=wasm #1002

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Build skiko.wasm with -s SUPPORT_LONGJMP=wasm #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion skiko/buildSrc/src/main/kotlin/tasks/configuration/CommonTasksConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion skiko/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading