Skip to content

drop redundant SK_BUILD_FOR_WASM define#204

Merged
mattleibow merged 2 commits into
mono:skiasharpfrom
ramezgerges:dev/fix-sk-build-for-wasm-redef
Jul 1, 2026
Merged

drop redundant SK_BUILD_FOR_WASM define#204
mattleibow merged 2 commits into
mono:skiasharpfrom
ramezgerges:dev/fix-sk-build-for-wasm-redef

Conversation

@ramezgerges

@ramezgerges ramezgerges commented Apr 28, 2026

Copy link
Copy Markdown

include/private/base/SkFeatures.h already auto-defines SK_BUILD_FOR_WASM under its __EMSCRIPTEN__ branch, so adding the same define on the em++ command line via GN just produced a "macro redefined" warning on every wasm translation unit.

Description of Change

Removes the redundant defines += [ "SK_BUILD_FOR_WASM" ] from the is_wasm block in gn/skia/BUILD.gn. No other flags in that block change.

SkiaSharp Issue

None.

API Changes

None.

Behavioral Changes

None. Only removes a duplicate compile-time define; the macro is still defined by SkFeatures.h.

Required SkiaSharp PR

Consumed by mono/SkiaSharp#3788.

PR Checklist

  • Rebased on top of skiasharp at time of PR
  • Changes adhere to coding standard
  • Updated documentation — n/a

ramezgerges and others added 2 commits April 28, 2026 15:27
include/private/base/SkFeatures.h auto-defines SK_BUILD_FOR_WASM under
the __EMSCRIPTEN__ branch, so adding the same define on the em++ command
line just produces a "macro redefined" warning on every wasm
translation unit.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@mattleibow mattleibow merged commit e1be35b into mono:skiasharp Jul 1, 2026
1 check passed
mattleibow added a commit to ramezgerges/SkiaSharp that referenced this pull request Jul 1, 2026
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>
mattleibow added a commit to mono/SkiaSharp that referenced this pull request Jul 1, 2026
[externals] Bump skia to drop redundant SK_BUILD_FOR_WASM define (#3788)

Changes: mono/skia@5209f4a...b789e70

Bumps the `externals/skia` submodule from `5209f4a4` to `b789e70f`, picking
up mono/skia#204. That change removes the redundant `SK_BUILD_FOR_WASM`
define from the `is_wasm` block in `gn/skia/BUILD.gn`; `SkFeatures.h` already
defines the macro under `__EMSCRIPTEN__`, so the GN-side define produced a
"macro redefined" warning on every wasm translation unit.

The new skia commit is the current `skiasharp` tip plus that one-line removal,
so this is purely the submodule reference change — no SkiaSharp source or API
is affected, and the wasm build behaves identically aside from the cleared
warnings.

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants