commit be3cefc864c61a77a7aa4f28a87b886081a00027
author dannark <dannark@google.com> Thu Dec 13 11:52:45 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Thu Dec 13 11:54:05 2018 -0800
tree 16ce47d29f1f3f8260ac18fd9fb5f0d8f47dec95
parent f23d6ccc8b598f9812ae6f9827bcb9916025d1b1

Factor out constants in Label class.

This is to be able to create an additional target in the cmdline package to split a cycle in unknown commit.

RELNOTES: None
PiperOrigin-RevId: 225409893

src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java

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 3331fda..aa7f036 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
@@ -15,7 +15,7 @@
 
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
-import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.cmdline.LabelConstants;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadCompatible;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
 import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -183,7 +183,7 @@
       return FileType.EXTERNAL;
     }
     if (rootedPath.asPath().startsWith(outputBase)) {
-      Path externalRepoDir = outputBase.getRelative(Label.EXTERNAL_PACKAGE_NAME);
+      Path externalRepoDir = outputBase.getRelative(LabelConstants.EXTERNAL_PACKAGE_NAME);
       if (rootedPath.asPath().startsWith(externalRepoDir)) {
         anyNonOutputExternalFilesSeen = true;
         return FileType.EXTERNAL_REPO;