Fix compile errors in 02e48afd8b (arg_replacements scrubbing)#42
Merged
azad-uber-2 merged 1 commit intoJul 2, 2026
Merged
Conversation
Commit 02e48af ("Apply arg_replacements scrubbing to params file cache key hashing") introduced two compile errors in the Uber fork: 1. CommandLines.java — getCharset() referenced a nonexistent `charset` field. The ParamFileActionInput constructor stores charset only in the superclass (ParameterFile) via super(), so there is no local field to return. Fixed by returning ISO_8859_1 directly (matching the existing ParameterFile default) and adding the required import. Also added a 4-arg constructor (PathFragment, Iterable<String>, ParameterFileType, Charset) that the new DirectoryTreeBuilder call site needs — it delegates to the existing 3-arg constructor. 2. DirectoryTreeBuilder.java — called .stream() on paramFile.getArguments(), which returns Iterable<String>, not Collection. Iterable has no .stream() method. Fixed by using Guava's Streams.stream() instead. Both errors prevented the Bazel binary from compiling on the uber/android/8.1.1 branch.
azad-uber-2
force-pushed
the
azad/fix-arg-replacements-compile-errors
branch
from
1f9c1ef to
5759fc1
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
1 participant
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.
Commit 02e48af ("Apply arg_replacements scrubbing to params file cache key hashing") introduced two compile errors in the Uber fork: