Skip to content

Skip RPATH patching on Schema v1 builds#5318

Open
notvictorl wants to merge 7 commits into
google:masterfrom
notvictorl:liuvic/rpath
Open

Skip RPATH patching on Schema v1 builds#5318
notvictorl wants to merge 7 commits into
google:masterfrom
notvictorl:liuvic/rpath

Conversation

@notvictorl

@notvictorl notvictorl commented Jun 11, 2026

Copy link
Copy Markdown
Collaborator

Currently, blackbox MSan jobs like linux_msan_chrome attempt 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 causing Bad build errors.

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.json to always be extracted, and using the file to read for archive_schema_version on 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

@notvictorl notvictorl requested a review from a team as a code owner June 11, 2026 18:00

@letitz letitz left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

One high-level question before a more thorough review.

Comment thread src/clusterfuzz/_internal/build_management/build_manager.py Outdated
@notvictorl notvictorl requested a review from letitz June 29, 2026 20:49
@notvictorl

Copy link
Copy Markdown
Collaborator Author

@letitz friendly nudge for re-review. thanks in advance!

@letitz letitz left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

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.

Comment thread src/clusterfuzz/_internal/build_management/build_manager.py Outdated
Comment thread src/clusterfuzz/_internal/build_management/build_manager.py Outdated
Comment thread src/clusterfuzz/_internal/build_management/build_manager.py Outdated
Comment thread src/clusterfuzz/_internal/build_management/build_manager.py Outdated
Comment thread src/clusterfuzz/_internal/build_management/build_manager.py Outdated
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.

3 participants