Make ManifestBuilder compatible with --experimental_sibling_repositor…

…y_layout. PiperOrigin-RevId: 340842436
bazelbuild · Nov 5, 2020 · ffdda7d · ffdda7d
1 parent b38680a
commit ffdda7d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
@@ -488,7 +488,7 @@ public Map<PathFragment, Artifact> build() {
  }
 
  private PathFragment getExternalPath(PathFragment path) {
- return checkForWorkspace(path.relativeTo(LabelConstants.EXTERNAL_PACKAGE_NAME));
+ return checkForWorkspace(path.subFragment(1));
  }
 
  private PathFragment checkForWorkspace(PathFragment path) {
@@ -498,7 +498,8 @@ private PathFragment checkForWorkspace(PathFragment path) {
  }
 
  private static boolean isUnderWorkspace(PathFragment path) {
- return !path.startsWith(LabelConstants.EXTERNAL_PACKAGE_NAME);
+ return !path.startsWith(LabelConstants.EXTERNAL_PATH_PREFIX)
+ && !path.startsWith(LabelConstants.EXPERIMENTAL_EXTERNAL_PATH_PREFIX);
  }
  }