[externals] Bump skia submodule to drop SK_BUILD_FOR_WASM redef#3788
Merged
mattleibow merged 3 commits intoJul 1, 2026
Conversation
Picks up mono/skia 85aa9d7884 which removes the SK_BUILD_FOR_WASM addition to em++'s -D flags. SkFeatures.h's __EMSCRIPTEN__ branch already defines it, so the GN-side define produced "macro redefined" warnings on every wasm translation unit. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Contributor
📦 Try the packages from this PRWarning Do not run these scripts without first reviewing the code in this PR. Step 1 — Download the packages bash / macOS / Linux: curl -fsSL https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.sh | bash -s -- 3788PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 3788"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-3788/packages --name skiasharp-pr-3788More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-3788 |
Contributor
|
Hey there @@ramezgerges! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed. |
Collaborator
|
/azp run |
|
No pipelines are associated with this pull request. |
# Conflicts: # externals/skia
3 tasks
mattleibow
added a commit
to mono/skia
that referenced
this pull request
Jul 1, 2026
[gn] Drop redundant SK_BUILD_FOR_WASM define (#204) `include/private/base/SkFeatures.h` already defines `SK_BUILD_FOR_WASM` in its `__EMSCRIPTEN__` branch. The `is_wasm` block in `gn/skia/BUILD.gn` added the same define to em++'s `-D` flags, so every wasm translation unit emitted a "macro redefined" warning. Remove the redundant `defines += [ "SK_BUILD_FOR_WASM" ]` from that block. The macro is still defined by `SkFeatures.h`, so the wasm build behaves identically — this only clears the warning noise. No other flags in the `is_wasm` block are touched. Consumed by mono/SkiaSharp#3788, which bumps the SkiaSharp `externals/skia` submodule to this change. Co-authored-by: Ramez Gerges <ramezragaa@proton.me> Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
mono/skia#204 was squash-merged into `skiasharp` as e1be35b2, so the previous PR-branch commit (b789e70f) is now orphaned and off-branch. Point the `externals/skia` submodule at the canonical `skiasharp` tip and sync the cgmanifest.json "Main Skia repository reference" commitHash to match. The tree at e1be35b2 is identical to b789e70f; only the recorded commit changes. No upstream milestone change, so the cgmanifest chrome/m151 CVE tracking entry is left untouched. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bumps the
externals/skiasubmodule to pick up mono/skia#204, which removes the redundantSK_BUILD_FOR_WASMaddition to em++'s-Dflags.SkFeatures.h's__EMSCRIPTEN__branch already defines it, so the GN-side define produced "macro redefined" warnings on every wasm translation unit.Description of Change
Updates the
externals/skiasubmodule toe1be35b2(theskiasharpbranch tip after mono/skia#204 was merged) and syncs thecgmanifest.json"Main Skia repository reference"commitHashto match. Only the submodule reference and that manifest SHA change.Bugs Fixed
None.
API Changes
None.
Behavioral Changes
None. Removes a duplicate compile-time define in the wasm build; the macro is still defined by Skia's
SkFeatures.h.Required skia PR
mono/skia#204 (merged)
PR Checklist