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

1 files changed, 2 insertions, 2 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;
       }