2 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/Label.java b/src/main/java/com/google/devtools/build/lib/cmdline/Label.java
index b3b31f42a1..ef5d9f465d 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/Label.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/Label.java
@@ -41,7 +41,12 @@ import java.io.Serializable;
 @SkylarkModule(name = "Label", doc = "A BUILD target identifier.")
 @Immutable @ThreadSafe
 public final class Label implements Comparable<Label>, Serializable, SkylarkPrintableValue {
-  private static final PathFragment EXTERNAL = new PathFragment("external");
+  public static final PathFragment EXTERNAL_PACKAGE_NAME = new PathFragment("external");
+
+  public static final PackageIdentifier EXTERNAL_PACKAGE_IDENTIFIER =
+      PackageIdentifier.createInDefaultRepo(EXTERNAL_PACKAGE_NAME);
+
+  public static final String EXTERNAL_PATH_PREFIX = "external";
 
   /**
    * Factory for Labels from absolute string form. e.g.
@@ -380,7 +385,7 @@ public final class Label implements Comparable<Label>, Serializable, SkylarkPrin
 
     if (packageIdentifier.getRepository().isDefault()
         || !relative.packageIdentifier.getRepository().isDefault()
-        || relative.packageIdentifier.getPackageFragment().equals(EXTERNAL)) {
+        || relative.packageIdentifier.getPackageFragment().equals(EXTERNAL_PACKAGE_NAME)) {
       return relative;
     } else {
       try {
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
index e992366f22..7ce70db0a1 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
@@ -48,10 +48,10 @@ import javax.annotation.concurrent.Immutable;
  */
 @Immutable
 public final class PackageIdentifier implements Comparable<PackageIdentifier>, Serializable {
-  public static final String EXTERNAL_PREFIX = "external";
 
   private static final Interner<PackageIdentifier> INTERNER = Interners.newWeakInterner();
 
+
   public static PackageIdentifier create(String repository, PathFragment pkgName)
       throws LabelSyntaxException {
     return create(RepositoryName.create(repository), pkgName);
@@ -145,7 +145,7 @@ public final class PackageIdentifier implements Comparable<PackageIdentifier>, S
      * was invalid.
      */
     public static Pair<RepositoryName, PathFragment> fromPathFragment(PathFragment path) {
-      if (path.segmentCount() < 2 || !path.getSegment(0).equals(EXTERNAL_PREFIX)) {
+      if (path.segmentCount() < 2 || !path.getSegment(0).equals(Label.EXTERNAL_PATH_PREFIX)) {
         return null;
       }
       try {
@@ -221,7 +221,7 @@ public final class PackageIdentifier implements Comparable<PackageIdentifier>, S
     public PathFragment getPathFragment() {
       return isDefault()
           ? PathFragment.EMPTY_FRAGMENT
-          : new PathFragment(EXTERNAL_PREFIX).getRelative(strippedName());
+          : new PathFragment(Label.EXTERNAL_PATH_PREFIX).getRelative(strippedName());
     }
 
     /**