diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2015-09-18 17:37:51 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-09-21 08:59:16 +0000 |
| commit | f172d396bbab9dec8f6beda0b0969f33a25709cd (patch) | |
| tree | 76da22fa1681be1bda2de36812aeec76876c6ea6 /src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | |
| parent | f081184097239243b436f96774b63b010d5e021f (diff) | |
Do not store a separate map for external package data. This ensures that serialization works correctly.
Removes ExternalPackage as Package specialization.
--
MOS_MIGRATED_REVID=103395682
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 | 7 |
1 files changed, 4 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 14a40da427..d613819fa4 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 @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.devtools.build.lib.analysis.BlazeDirectories; -import com.google.devtools.build.lib.packages.ExternalPackage.Builder; +import com.google.devtools.build.lib.packages.Package.Builder; import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.RuleClassProvider; import com.google.devtools.build.lib.packages.WorkspaceFactory; @@ -61,8 +61,9 @@ public class WorkspaceFileFunction implements SkyFunction { } Path repoWorkspace = workspaceRoot.getRoot().getRelative(workspaceRoot.getRelativePath()); - Builder builder = new Builder(repoWorkspace, - packageFactory.getRuleClassProvider().getRunfilesPrefix()); + Builder builder = + com.google.devtools.build.lib.packages.Package.newExternalPackageBuilder( + repoWorkspace, packageFactory.getRuleClassProvider().getRunfilesPrefix()); try (Mutability mutability = Mutability.create("workspace %s", repoWorkspace)) { WorkspaceFactory parser = new WorkspaceFactory( |