From bd016c982da39d86f20e080eaf448828d05648fa Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Fri, 9 Sep 2016 14:10:44 +0000 Subject: Make the code that is using execRoot paths use execRoot paths Chipping away at making the big CL for #1262 smaller. Only runfiles paths are different right now, so this makes getPathUnderExecRoot and getSourceRoot return the same thing. Also corrected a couple places where Label.EXTERNAL_PATH_PREFIX and Label.EXTERNAL_PACKAGE_NAME were being used incorrectly. -- MOS_MIGRATED_REVID=132671081 --- .../com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/skyframe') 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 b1b6259e90..664cf9888a 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 @@ -137,7 +137,7 @@ public class ExternalFilesHelper { return FileType.EXTERNAL_MUTABLE; } if (rootedPath.asPath().startsWith(outputBase)) { - Path externalRepoDir = outputBase.getRelative(Label.EXTERNAL_PATH_PREFIX); + Path externalRepoDir = outputBase.getRelative(Label.EXTERNAL_PACKAGE_NAME); if (rootedPath.asPath().startsWith(externalRepoDir)) { anyNonOutputExternalFilesSeen = true; return FileType.EXTERNAL_REPO; -- cgit v1.2.3