diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2015-02-27 17:14:12 +0000 |
|---|---|---|
| committer |  Ulf Adams <ulfjack@google.com> | 2015-03-05 14:15:41 +0000 |
| commit | 91876f004def4a7858bb614091a6cd2fbef681fc (patch) | |
| tree | c4d4e1473f7c327f8014443998f129fb7563057d /src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | |
| parent | 79f052118e94c418247c4ea0ba6fcd3a35ca7e0d (diff) | |
Make Rule know about the name of the workspace it is in.
This is needed for taking the runfiles prefix from the WORKSPACE file instead of hardcoding it.
--
MOS_MIGRATED_REVID=87347883
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java index 89126cb73d..a5bbbef020 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.cmdline.LabelValidator; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.StoredEventHandler; -import com.google.devtools.build.lib.packages.ExternalPackage; import com.google.devtools.build.lib.packages.ExternalPackage.Binding; import com.google.devtools.build.lib.packages.ExternalPackage.Builder; import com.google.devtools.build.lib.packages.ExternalPackage.Builder.NoSuchBindingException; @@ -95,8 +94,7 @@ public class WorkspaceFileFunction implements SkyFunction { throw new WorkspaceFileFunctionException(e); } - ExternalPackage pkg = builder.build(); - return new WorkspaceFileValue(pkg.getWorkspaceName(), pkg); + return new PackageValue(builder.build()); } private void parseWorkspaceFile(Path workspaceFilePath, Builder builder) |