Make missing substitution logic common. #1874
Merged
Conversation
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
We previously updated part of the substitution logic to not treat missing files as an error in google#1716, but that change only updates the marker file-based substitutions. To bring this logic to flag-based substitution, we make the newer logic common to both branches, which necessitated moving some of the logic around.
jemoreira
approved these changes
Dec 8, 2025
3405691582
added a commit
to 3405691582/android-cuttlefish
that referenced
this pull request
Dec 9, 2025
In google#1874 @jemoreira pointed out that there was a potential for code re-use with `GetCuttlefishCommonDir`. Since this was outside the diff in that change, let's do this here.
3405691582
added a commit
to 3405691582/android-cuttlefish
that referenced
this pull request
Dec 9, 2025
In google#1874 @jemoreira pointed out that there was a potential for code re-use with `GetCuttlefishCommonDir`. Since this was outside the diff in that change, let's do this here.
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
3405691582
added a commit
to 3405691582/android-cuttlefish
that referenced
this pull request
Dec 10, 2025
In google#1874 @jemoreira pointed out that there was a potential for code re-use with `GetCuttlefishCommonDir`. Since this was outside the diff in that change, let's do this here.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 10, 2025
In #1874 @jemoreira pointed out that there was a potential for code re-use with `GetCuttlefishCommonDir`. Since this was outside the diff in that change, let's do this here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
We previously updated part of the substitution logic to not treat missing files as an error in #1716, but that change only updates the marker file-based substitutions. To bring this logic to flag-based substitution, we make the newer logic common to both branches, which necessitated moving some of the logic around.