Skip RPATH patching on Schema v1 builds#5318
Open
notvictorl wants to merge 7 commits into
Open
Conversation
letitz
reviewed
Jun 12, 2026
letitz
left a comment
Collaborator
There was a problem hiding this comment.
One high-level question before a more thorough review.
Collaborator
Author
|
@letitz friendly nudge for re-review. thanks in advance! |
letitz
reviewed
Jul 7, 2026
letitz
left a comment
Collaborator
There was a problem hiding this comment.
Oh man, I was sitting on a pending review for days. Sorry about that. When I checked it I saw the comments and did not see answers, but I missed that all my comments were marked as pending 🤦 .
I think we're nearly there, this is looking good.
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.
Currently, blackbox MSan jobs like
linux_msan_chromeattempt to patch the RPATHs of binaries to point to instrumented libs provided in the Dockerfile since schema v0 archives did not include the instrumented libs in the archives. Schema v1 archives do include the instrumented libs that are needed by the binaries, but ClusterFuzz still tries to patch the RPATHs leading to mismatches causingBad builderrors.ClusterFuzz can safely skip RPATH patching for MSan Schema v1 jobs so that the binaries can use the instrumented libs included in the same archive. Adding
clusterfuzz_manifest.jsonto always be extracted, and using the file to read forarchive_schema_versionon new and re-used builds to know if RPATH patching can be skipped. Decoupling_patch_rpaths()from_post_setup_success()to allow us to handle Release and Debug separately, and helps if schema versions are different.More info: https://crbug.com/516755275