Skip to content

Reuse the empty runfiles provider #31219

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

Closed
dzbarsky wants to merge 1 commit into from
+4 −2
Closed

Reuse the empty runfiles provider #31219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/com/google/devtools/build/lib/analysis/RunfilesProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,14 @@ public Runfiles apply(TransitiveInfoCollection input) {
};

public static RunfilesProvider simple(Runfiles defaultRunfiles) {
return new RunfilesProvider(defaultRunfiles, defaultRunfiles);
return withData(defaultRunfiles, defaultRunfiles);
}

public static RunfilesProvider withData(
Runfiles defaultRunfiles, Runfiles dataRunfiles) {
return new RunfilesProvider(defaultRunfiles, dataRunfiles);
return defaultRunfiles == Runfiles.EMPTY && dataRunfiles == Runfiles.EMPTY
? EMPTY
: new RunfilesProvider(defaultRunfiles, dataRunfiles);
}

public static final RunfilesProvider EMPTY = new RunfilesProvider(
Expand Down
Loading