diff options
author | Lukacs Berki <lberki@google.com> | 2015-12-10 11:34:29 +0000 |
---|---|---|
committer | Lukacs Berki <lberki@google.com> | 2015-12-10 12:41:41 +0000 |
commit | e19ee2743966069c6dcce375fe89b07835c34723 (patch) | |
tree | 076446231d61b7467fe20fb620bc022d140cb309 /src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | |
parent | d4b78d0f7c2d3e6714f82538eca30e2414e97fdc (diff) |
Shuffle around all the constants related to the name of the //external package and the prefix of external packages in the execroot.
This is in preparation for renaming that path segment from "external" to "bazel-external" so that we can provide a symlink to it from the source tree so that the source tree looks like the execroot.
--
MOS_MIGRATED_REVID=109882753
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, 2 insertions, 2 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 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); |