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

Jump to bottom

Update third_party/brotli subtree #389

Merged
merged 7 commits into from
May 18, 2023
Merged

Update third_party/brotli subtree #389

merged 7 commits into from
May 18, 2023

Conversation

sherryzy
Copy link
Contributor

b/277591845

@sherryzy
Reset third_party/brotli dir
9b89a51
@sherryzy
Squashed 'third_party/brotli/' content from commit 3af18990f5
d6148ac 
git-subtree-dir: third_party/brotli
git-subtree-split: 3af18990f50d8f040038aaa08c41f5d27d62efb5
@sherryzy
Merge commit 'd6148ac0f551825f195612d4ffaa08e25fee0cce' as 'third_par…
249480d 
…ty/brotli'
@sherryzy
Squashed 'third_party/brotli/' changes from 3af18990f5..e61745a6b7
f9b239c 
e61745a6b7 Re-release
db361a0bb9 Re-add python bindings to sources tarball
d518e55ba7 Update README.md
d052918255 Fix build files (youtube#829)
665e81dc9b New version: 1.0.8 (youtube#827)
223d80cfbe Update (youtube#826)
0c5603e07b Fix output parameter type for _BitScanReverse (youtube#819)
e8155d67b0 CMake: change default ("") build type to Release (youtube#818)
fc823290a7 Mute strerror/strcpy warnings is MSVC build. (youtube#815)
5519352661 Add workaround for lying feof. (youtube#814)
d2ea198232 Update platform.h (youtube#813)
31754d4ffc Add runtime linker path to pkg-config files (youtube#740)
8f093f5e84 .gitignore: Ignore .obj files (youtube#805)
f0db711f46 Filter sources for the tarball. (youtube#808)
7f740f1308 Update (youtube#807)
f83aa5169e Update bazel to 2.2 + update config (youtube#798)
924b2b2b9d Move TZCNT and BSR intrinsics to platform.h, add MSVC versions (youtube#636)
0503d8b766 Added go.mod file to go/cbrotli directory (youtube#754)
f503cb709c Add HAVE_LOG2 build macro (youtube#783)
36ac0feaf9 Adding CIFuzz (youtube#797)
666c3280cc Make types of variable match (youtube#796)
4b5771bee7 Add missing "const" to a couple of kConstants (youtube#780)
c435f06675 Add vcpkg installation instructions (youtube#776)
5c3a9a937b Fix license in setup.py (youtube#769)
afc4a74273 Add oss-fuzz fuzzing status badge to README (youtube#767)
35ef5c554d Disable PIC in EMCC mode. (youtube#768)
ca21dac8e5 Add an option to avoid building shared libraries. (youtube#766)
3d1767186d Fix include for EMCC build (youtube#765)
f1124c8524 More careful sanitizer detection (youtube#764)
c8b37e8fd1 Update (youtube#762)
40f0fdcdc1 Explicitly mark tests/testdata/* as binary. (youtube#761)
78e7bbc3c3 Update (youtube#753)
4b2b2d4f83 Update (youtube#749)
9cd01c0437 Update WORKSPACE files. (youtube#742)
8109882ecf Fix youtube#741
5805f99a53 Ensure decompression consumes all input (youtube#730)
d0ffe60b87 Verbose CLI + start pulling "Shared-Brotli" (youtube#722)
d6d98957ca Ramp up version to 1.0.7
a1e44975a7 Fix youtube#698
a799e34c7f Remove dependency to full JDK. This should speedup clean builds. (youtube#719)
7a153ebb09 make/build: ensure NEON is enabled and tested (youtube#718)
ce8951c3e9 Fix `<arm_neon.h>` inclusion guard. (youtube#717)
f7cbc97c96 Fix typo / minor formatting (youtube#716)
cc7a74f15f decode: fix NEON inclusion (youtube#714)
c94c6f805c tools/brotli: improve window size autodetect (youtube#710)
9402ac5c08 decode: faster huffman code loading on 32-bit Arm (youtube#703)
67f059eaf5 Cross compilation support (youtube#709)
6eba239a5b Fix auto detect of bundled mode (youtube#704)
2216a0dd63 Update (youtube#706)
d4cd6cdf1c platform: fix unaligned 64-bit accesses on AArch32 (youtube#702)
8a073bd9e2 Revert "platform: fix unaligned 64-bit accesses on AArch32 (youtube#699)" (youtube#701)
6d027d1648 platform: fix unaligned 64-bit accesses on AArch32 (youtube#699)
fc4d345968 Fix missing header files (youtube#695)
b601fe817b Ramp up version to 1.0.5
ee2a5e1540 Update go_library to use standard importpath (youtube#690)
eb12ec04eb Update (youtube#688)
7505290ef9 Convert fuzzer to C99. (youtube#686)
ff05c35166 Add VS2017 release Appveyor build (youtube#685)
09cd3e877f Update
8544ae858d Update (youtube#680)
1e7ea1d8e6 Inverse bazel project/workspace tree (youtube#677)
29dc2cce90 Update golang and JS Bazel plugins to latest stable versions. (youtube#676)
f9b8c02673 Add RISC-V 64-bit (riscv64) platform configuration (youtube#669)
48a25b3fa4 Fix youtube#671 (youtube#672)
a4581c158e Add tools to download and transform static dictionary data. (youtube#670)
f5ed35d065 Update (youtube#664)
f94cd51b5c appveyor: fix issue self-upgradig pip to v10 (youtube#663)
6000396155 Remove unprefixed macros from public headers (youtube#662)
68db5c0272 Update (youtube#660)
c6333e1e79 Fix MSVC compilation (youtube#657)
0f3c84e745 Update (youtube#656)
515fc62313 Tell CMake to not check for a C++ compiler (youtube#653)
2c03482569 Fix "memory leak" in python tests (youtube#652)
a238f5bac9 Update README.md (youtube#646)
631fe194a1 Update (youtube#651)
533843e354 Update (youtube#643)
35e69fc7cf New feature: "Large Window Brotli" (youtube#640)

git-subtree-dir: third_party/brotli
git-subtree-split: e61745a6b7add50d380cfd7d3883dd6c62fc2c71
@sherryzy
Update brotli subtree to commit e61745a6b7add50d380cfd7d3883dd6c62fc2c71
eacde8e
@sherryzy sherryzy force-pushed the brotli_update branch 4 times, most recently from 5fbfae3 to 1a4b84d Compare May 16, 2023 23:25
kaidokert
kaidokert reviewed May 17, 2023
View reviewed changes
third_party/brotli/c/enc/ringbuffer.h Outdated Show resolved Hide resolved
third_party/brotli/c/common/platform.h Outdated Show resolved Hide resolved
third_party/brotli/c/common/platform.c Outdated Show resolved Hide resolved
third_party/brotli/c/dec/bit_reader.h Outdated Show resolved Hide resolved
third_party/brotli/c/dec/huffman.c Outdated Show resolved Hide resolved
third_party/brotli/c/dec/huffman.c Outdated Show resolved Hide resolved
third_party/brotli/c/enc/hash_longest_match_quickly_inc.h Show resolved Hide resolved
third_party/brotli/c/enc/memory.h Outdated Show resolved Hide resolved
@kaidokert kaidokert requested a review from y4vor May 17, 2023 02:22
sherryzy
sherryzy commented May 17, 2023
View reviewed changes
.gitmodules Outdated Show resolved Hide resolved
dahlstrom-g
dahlstrom-g approved these changes May 17, 2023
View reviewed changes
Copy link
Contributor

@dahlstrom-g dahlstrom-g left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm all out of nits!
(I'm selecting “Approve” but I'm new here and you may want to await approval from someone better acquainted with Cobalt.)

dahlstrom-g

This comment was marked as duplicate.

Sign in to view

@kaidokert @sherryzy
Address more submodule checkout issues (youtube#406)
028abab 
This uses the patched workaround version of checkout action to
sidestep submodules issues. In original PR youtube#383 we only fixed
Windows workflows that had issues due to persistent runners, but
similar problems also trip on Linux/other builds.

b/282361986
kaidokert
kaidokert approved these changes May 18, 2023
View reviewed changes
Copy link
Member

@kaidokert kaidokert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ready to merge now - please give me a ping to confirm it should go in and i'll go ahead and do the merge.

dahlstrom-g

This comment was marked as duplicate.

Sign in to view

@dahlstrom-g
Copy link
Contributor

dahlstrom-g commented May 18, 2023 •
edited
Loading

  1. We don't want to submit commit 028abab here, do we?

  2. I took the third_party/brotli tree from commit 5d0e0a0
    and dropped it into a merge commit atop a simpler squash setup:
    http://github.com/dahlstrom-g/cobalt/commits/brotli_update
    The merge commit preserves local history in BUILD.gn, METADATA,
    and elsewhere unlike the way 9b89a51 deletes all files
    creating a discontinuity in history.
    Additionally, going forward, the simpler structure allows
    seeing all diffs from upstream with git diff 25ca54e8 -- third_party/brotli.
    Feel free to grab my commits and use them here if you like.

@kaidokert
Copy link
Member

  1. We don't want to submit commit 028abab here, do we?

I'm actually fine submitting this - it's a small crutch to just verify the checks are green. It'll get elided at the time of merge because that commit is already on main. We did the same to get Jelle's PR landed here #381

As we are in a bit of time crunch to get the updates in before a major branch cut i'm fine leaving this whole thing as is for merge.

@kaidokert kaidokert merged commit 3f7ed5e into youtube:main May 18, 2023
jellefoks added a commit to jellefoks/cobalt that referenced this pull request May 23, 2023
@jellefoks
Revert "Merge pull request youtube#389 from sherryzy/brotli_update"
0bd1af0 
This reverts commit 3f7ed5e, reversing
changes made to 31caddb.
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dahlstrom-g dahlstrom-g dahlstrom-g approved these changes

@kaidokert kaidokert kaidokert approved these changes

@y4vor y4vor Awaiting requested review from y4vor

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sherryzy @dahlstrom-g @kaidokert @y4vor