diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe')
4 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java index f21e4ca0c9..59bc07faaa 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.base.Preconditions; -import com.google.devtools.build.lib.cmdline.PackageIdentifier; +import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.vfs.RootedPath; import com.google.devtools.build.skyframe.SkyFunction; @@ -92,7 +92,7 @@ public class ExternalFilesHelper { // files is small. // TODO(kchodorow): check that the path is under output_base/external before adding the dep. PackageValue pkgValue = (PackageValue) env.getValue(PackageValue.key( - PackageIdentifier.createInDefaultRepo(PackageIdentifier.EXTERNAL_PREFIX))); + Label.EXTERNAL_PACKAGE_IDENTIFIER)); if (pkgValue == null) { return; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java index ce1b4c3a20..34b4907f30 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java @@ -394,10 +394,10 @@ public class PackageFunction implements SkyFunction { } } - if (packageId.equals(Package.EXTERNAL_PACKAGE_IDENTIFIER)) { + if (packageId.equals(Label.EXTERNAL_PACKAGE_IDENTIFIER)) { return getExternalPackage(env, packageLookupValue.getRoot()); } - SkyKey externalPackageKey = PackageValue.key(Package.EXTERNAL_PACKAGE_IDENTIFIER); + SkyKey externalPackageKey = PackageValue.key(Label.EXTERNAL_PACKAGE_IDENTIFIER); PackageValue externalPackage = (PackageValue) env.getValue(externalPackageKey); if (externalPackage == null) { return null; @@ -405,7 +405,7 @@ public class PackageFunction implements SkyFunction { Package externalPkg = externalPackage.getPackage(); if (externalPkg.containsErrors()) { throw new PackageFunctionException( - new BuildFileContainsErrorsException(Package.EXTERNAL_PACKAGE_IDENTIFIER), + new BuildFileContainsErrorsException(Label.EXTERNAL_PACKAGE_IDENTIFIER), Transience.PERSISTENT); } @@ -947,7 +947,7 @@ public class PackageFunction implements SkyFunction { private static class BadWorkspaceFileException extends NoSuchPackageException { private BadWorkspaceFileException(String message) { super( - Package.EXTERNAL_PACKAGE_IDENTIFIER, + Label.EXTERNAL_PACKAGE_IDENTIFIER, "Error encountered while dealing with the WORKSPACE file: " + message); } } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java index 36350f5c31..9a53dd317b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java @@ -14,11 +14,11 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.collect.ImmutableSet; +import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelValidator; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.packages.BuildFileNotFoundException; import com.google.devtools.build.lib.packages.NoSuchPackageException; -import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.vfs.Path; @@ -57,7 +57,7 @@ public class PackageLookupFunction implements SkyFunction { if (!packageKey.getRepository().equals(PackageIdentifier.MAIN_REPOSITORY_NAME) && !packageKey.getRepository().isDefault()) { return computeExternalPackageLookupValue(skyKey, env, packageKey); - } else if (packageKey.equals(Package.EXTERNAL_PACKAGE_IDENTIFIER)) { + } else if (packageKey.equals(Label.EXTERNAL_PACKAGE_IDENTIFIER)) { return computeWorkspaceLookupValue(env, packageKey); } 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 a1bb468638..84db2d3c8f 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.cmdline.PackageIdentifier; +import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Package.LegacyBuilder; import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.RuleClassProvider; @@ -106,7 +106,7 @@ public class WorkspaceFileFunction implements SkyFunction { // Load skylark imports PackageFunction.SkylarkImportResult importResult; importResult = PackageFunction.fetchImportsFromBuildFile(repoWorkspace, - PackageIdentifier.createInDefaultRepo("external"), + Label.EXTERNAL_PACKAGE_IDENTIFIER, parser.getBuildFileAST(), skyEnvironment, null); |