From 4240b4f46dee1e1a8dfa3814ed5dc1ffc15c80fc Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jun 2026 14:10:49 -0500 Subject: [PATCH] [build] Switch lz4 submodule to upstream lz4/lz4 The `external/lz4` submodule has been pointing at `dotnet/lz4` (a fork of `lz4/lz4`) for historical reasons, but the fork carries no downstream changes -- every commit "ahead" of upstream is just a no-op merge from the periodic mirror sync. Switch the submodule to track upstream `lz4/lz4` directly so we can pick up active maintenance and security fixes when we next bump the pin. Changes: * `.gitmodules`: `url = https://github.com/lz4/lz4`, `branch = dev`. * `external/lz4` gitlink: bumped from `ebb370ca83af193212df4dcbadcc5d87bc0de2f0` (a merge commit owned by the fork) to `68959d27c3ec37b339b3b8ecfea155faf0ef94f2`, which is the upstream `dev`-side parent of that merge. The two trees are byte-identical (same root tree SHA `1ff35e0f...`), so this is a no-op for the source content. * `.github/skills/update-tpn/SKILL.md`: drop the "(fork of ...)" note on the lz4 row -- it's no longer a fork. Verified `dotnet-local.cmd build src/native/native-mono.csproj -p:Configuration=Debug` produces 0 errors and the expected `libxa-lz4-release.a` for all four ABIs (`android-arm`, `android-arm64`, `android-x64`, `android-x86`). This supersedes #11658, which had vendored the lz4 sources into `src-ThirdParty/lz4/`; that approach was abandoned in favor of this simpler submodule URL switch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/skills/update-tpn/SKILL.md | 2 +- .gitmodules | 4 ++-- external/lz4 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/skills/update-tpn/SKILL.md b/.github/skills/update-tpn/SKILL.md index 8bf5cc18b7a..93b7bf7e590 100644 --- a/.github/skills/update-tpn/SKILL.md +++ b/.github/skills/update-tpn/SKILL.md @@ -56,7 +56,7 @@ Read `.gitmodules` for all submodules. Current submodules and their license file | Submodule | URL | License File | |-----------|-----|-------------| | Java.Interop | https://github.com/dotnet/java-interop | `external/Java.Interop/LICENSE` | -| lz4 | https://github.com/dotnet/lz4 (fork of https://github.com/lz4/lz4) | `external/lz4/lib/LICENSE` | +| lz4 | https://github.com/lz4/lz4 | `external/lz4/lib/LICENSE` | | xxHash | https://github.com/Cyan4973/xxHash | `external/xxHash/LICENSE` | | constexpr-xxh3 | https://github.com/chys87/constexpr-xxh3 | `external/constexpr-xxh3/LICENSE` | | robin-map | https://github.com/xamarin/robin-map (fork of https://github.com/Tessil/robin-map) | `external/robin-map/LICENSE` | diff --git a/.gitmodules b/.gitmodules index 760c2b84aeb..dfd239f8549 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,8 +20,8 @@ branch = v1.8-stable [submodule "external/lz4"] path = external/lz4 - url = https://github.com/dotnet/lz4 - branch = release + url = https://github.com/lz4/lz4 + branch = dev [submodule "external/robin-map"] path = external/robin-map url = https://github.com/xamarin/robin-map diff --git a/external/lz4 b/external/lz4 index ebb370ca83a..68959d27c3e 160000 --- a/external/lz4 +++ b/external/lz4 @@ -1 +1 @@ -Subproject commit ebb370ca83af193212df4dcbadcc5d87bc0de2f0 +Subproject commit 68959d27c3ec37b339b3b8ecfea155faf0ef94f2