From 8a0a22784742e849868b4aa4fde2fce38c9d0546 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 10 Dec 2020 06:36:57 -0800 Subject: [PATCH] Fix a wrong usage of LabelConstants.EXTERNAL_PACKAGE_NAME. PackageIdentifier#getPackagePath is used for constructing artifact paths (primarily derived artifacts), not package names, so LabelConstants.EXTERNAL_PATH_PREFIX is the correct one to use there. PiperOrigin-RevId: 346772443 --- .../google/devtools/build/lib/cmdline/PackageIdentifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a98683d5f03976..d75e99ca679c9d 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 @@ -185,7 +185,7 @@ public PathFragment getSourceRoot() { public PathFragment getPackagePath(boolean siblingRepositoryLayout) { return repository.isDefault() || repository.isMain() || siblingRepositoryLayout ? pkgName - : LabelConstants.EXTERNAL_PACKAGE_NAME + : LabelConstants.EXTERNAL_PATH_PREFIX .getRelative(repository.strippedName()) .getRelative(pkgName); }