aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
index 4da947e0bd..778c20b45f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
@@ -103,7 +103,13 @@ public final class DefaultInfo extends NativeInfo implements DefaultInfoApi {
@Override
public Runfiles getDefaultRunfiles() {
- return defaultRunfiles;
+ if (dataRunfiles == null && defaultRunfiles == null) {
+ // This supports the legacy skylark runfiles constructor -- if the 'runfiles' attribute
+ // is used, then default_runfiles will return all runfiles.
+ return runfiles;
+ } else {
+ return defaultRunfiles;
+ }
}
/**