diff options
| author |  cparsons <cparsons@google.com> | 2018-06-26 14:15:18 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-26 14:17:15 -0700 |
| commit | fba7cfb0513595240e9c95a48f37be6bd8b7a448 (patch) | |
| tree | 0f131fa90f6acfcbbeb50465213696c83bf379a4 /src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java | |
| parent | 5d85e75601b1c82bbc1358d399afa3e07e87a766 (diff) | |
Make DefaultInfo.default_runfiles return all runfiles if the runfiles field of DefaultInfo() was used.
RELNOTES: None.
PiperOrigin-RevId: 202192091
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java | 8 |
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; + } } /** |