Unify ANGLE dependency into Skia DEPS file#3701
Draft
mattleibow wants to merge 1 commit into
Draft
Conversation
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 -- 3701PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 3701"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-3701/packages --name skiasharp-pr-3701More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-3701 |
Move ANGLE from a standalone clone in winui-angle/build.cake into the Skia DEPS file using the deps_os["win"] conditional section, so git-sync-deps handles ANGLE checkout alongside all other dependencies. ANGLE is only synced on Windows where it is needed. Changes: - externals/skia: Add deps_os["win"] with ANGLE pinned to chromium/6275 - native-shared.cake: Pass OS arg to git-sync-deps, add SyncAngle() helper for submodule init + post-checkout setup - winui-angle/build.cake: Remove sync-ANGLE clone/setup logic, update ANGLE_PATH to new location under skia third_party, keep WinAppSDK setup and build tasks - externals.cake: Update clean path to new ANGLE location - VERSIONS.txt: Add comment noting DEPS is source of truth Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
c8e0754 to
bb96f00
Compare
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
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.
Move ANGLE from a standalone
git cloneinwinui-angle/build.cakeinto the Skia DEPS file using thedeps_os["win"]conditional section. This meansgit-sync-depshandles ANGLE checkout alongside all other dependencies, but only on Windows where it's needed for WinUI builds.Companion PR: mono/skia#183 — adds the
deps_os["win"]entry to DEPSWhat changed
externals/skiadeps_os["win"]ANGLE entryscripts/cake/native-shared.cakegit-sync-deps; addsSyncAngle()for submodule init + setupnative/winui-angle/build.cakesync-ANGLE; updatesANGLE_PATHto new location; keeps WinAppSDK setup + build tasksscripts/cake/externals.cakescripts/VERSIONS.txtHow it works
git-sync-depsin the DEPS file now has adeps_ossection:git-sync-depstask passes"win"/"mac"/"unix"as a CLI arg so platform-conditional deps are syncedSyncAngle()inits only the 7 required submodules and runs post-checkout setup (patches, gclient_args, LASTCHANGE, rc.exe, LLVM)sync-ANGLEin the ANGLE build file now only handles WinAppSDK generation — all other setup moved to shared syncBenefits
git-sync-deps) handles everythingdeps_os["win"]entries are only fetched when OS arg is"win"