commit 015f586fcb2e127ed13691b573de42cd9dba8508
author lberki <lberki@google.com> Thu Feb 20 10:08:29 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Feb 20 10:09:40 2020 -0800
tree 194a6bcb3f628c3c9f61f0cd0155f5238fbe7ad0
parent e821cfaf76c42f4bb9883340aff874fe8ad950ec

Add the --experimental_disable_external package command line option that (unsurprisingly) disables the //external package

This has the side effect of allowing labels in the unnamed package to start
with "external" (e.g. //:external/foo/bar)

RELNOTES: None.
PiperOrigin-RevId: 296237592

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 1fcbc4e..df04a16 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
@@ -245,7 +245,7 @@
       return FileType.EXTERNAL;
     }
     if (rootedPath.asPath().startsWith(outputBase)) {
-      Path externalRepoDir = outputBase.getRelative(LabelConstants.EXTERNAL_PACKAGE_NAME);
+      Path externalRepoDir = outputBase.getRelative(LabelConstants.EXTERNAL_REPOSITORY_LOCATION);
       if (rootedPath.asPath().startsWith(externalRepoDir)) {
         anyNonOutputExternalFilesSeen = true;
         return FileType.EXTERNAL_REPO;