diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
7 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index 7c18968f6b..036e7473b1 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -478,7 +478,7 @@ public class BuildView { String bzlFileLoadLikeString = aspect.substring(0, delimiterPosition); if (!bzlFileLoadLikeString.startsWith("//") && !bzlFileLoadLikeString.startsWith("@")) { // "Legacy" behavior of '--aspects' parameter. - bzlFileLoadLikeString = new PathFragment("/" + bzlFileLoadLikeString).toString(); + bzlFileLoadLikeString = PathFragment.create("/" + bzlFileLoadLikeString).toString(); if (bzlFileLoadLikeString.endsWith(".bzl")) { bzlFileLoadLikeString = bzlFileLoadLikeString.substring(0, bzlFileLoadLikeString.length() - ".bzl".length()); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java index e38c3d9cc8..ae8736cdc9 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java @@ -298,6 +298,6 @@ public final class CommandHelper { private PathFragment shellPath(Map<String, String> executionInfo) { // Use vanilla /bin/bash for actions running on mac machines. return executionInfo.containsKey(ExecutionRequirements.REQUIRES_DARWIN) - ? new PathFragment("/bin/bash") : ruleContext.getConfiguration().getShellExecutable(); + ? PathFragment.create("/bin/bash") : ruleContext.getConfiguration().getShellExecutable(); } } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java index a54befb9e3..3ebdd78f76 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java @@ -554,7 +554,7 @@ public final class RuleContext extends TargetContext * thus guaranteeing that it never clashes with artifacts created by rules in other packages. */ public Artifact getPackageRelativeArtifact(String relative, Root root) { - return getPackageRelativeArtifact(new PathFragment(relative), root); + return getPackageRelativeArtifact(PathFragment.create(relative), root); } /** @@ -562,7 +562,7 @@ public final class RuleContext extends TargetContext * guaranteeing that it never clashes with artifacts created by rules in other packages. */ public Artifact getBinArtifact(String relative) { - return getBinArtifact(new PathFragment(relative)); + return getBinArtifact(PathFragment.create(relative)); } public Artifact getBinArtifact(PathFragment relative) { @@ -575,7 +575,7 @@ public final class RuleContext extends TargetContext * guaranteeing that it never clashes with artifacts created by rules in other packages. */ public Artifact getGenfilesArtifact(String relative) { - return getGenfilesArtifact(new PathFragment(relative)); + return getGenfilesArtifact(PathFragment.create(relative)); } public Artifact getGenfilesArtifact(PathFragment relative) { @@ -664,7 +664,7 @@ public final class RuleContext extends TargetContext */ public Artifact getUniqueDirectoryArtifact( String uniqueDirectory, String relative, Root root) { - return getUniqueDirectoryArtifact(uniqueDirectory, new PathFragment(relative), root); + return getUniqueDirectoryArtifact(uniqueDirectory, PathFragment.create(relative), root); } /** @@ -1235,7 +1235,7 @@ public final class RuleContext extends TargetContext * <p>For example "pkg/dir/name" -> "pkg/<fragment>/rule/dir/name. */ public final PathFragment getUniqueDirectory(String fragment) { - return AnalysisUtils.getUniqueDirectory(getLabel(), new PathFragment(fragment)); + return AnalysisUtils.getUniqueDirectory(getLabel(), PathFragment.create(fragment)); } /** 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 index 2ef4c2ca33..33c5d0aab2 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java @@ -785,7 +785,7 @@ public final class Runfiles { * created. */ public Builder(String workspace, boolean legacyExternalRunfiles) { - this(new PathFragment(workspace), legacyExternalRunfiles); + this(PathFragment.create(workspace), legacyExternalRunfiles); } /** diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java index 67dae4d2ba..26eeadc3ff 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java @@ -267,7 +267,7 @@ public final class PopulateTreeArtifactAction extends AbstractAction { for (String line : FileSystemUtils.iterateLinesAsLatin1(archiveManifest.getPath())) { if (!line.isEmpty()) { - PathFragment path = new PathFragment(line); + PathFragment path = PathFragment.create(line); if (!path.isNormalized() || path.isAbsolute()) { throw new IllegalManifestFileException( diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index ce1316f56d..664429ed00 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -999,7 +999,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie * commands to be executed. */ public Builder setShellCommand(Iterable<String> command) { - this.executable = new PathFragment(Iterables.getFirst(command, null)); + this.executable = PathFragment.create(Iterables.getFirst(command, null)); // The first item of the commands is the shell executable that should be used. this.executableArgs = ImmutableList.copyOf(Iterables.skip(command, 1)); this.isShellCommand = true; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BinTools.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BinTools.java index 73cc667034..2dd779f011 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BinTools.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BinTools.java @@ -139,7 +139,7 @@ public final class BinTools { if (!embeddedTools.contains(embedPath)) { return null; } - return new PathFragment("_bin").getRelative(new PathFragment(embedPath).getBaseName()); + return PathFragment.create("_bin").getRelative(PathFragment.create(embedPath).getBaseName()); } public Artifact getEmbeddedArtifact(String embedPath, ArtifactFactory artifactFactory) { @@ -174,7 +174,7 @@ public final class BinTools { private void setupTool(String embeddedPath) throws ExecException { Path sourcePath = directories.getEmbeddedBinariesRoot().getRelative(embeddedPath); - Path linkPath = binDir.getRelative(new PathFragment(embeddedPath).getBaseName()); + Path linkPath = binDir.getRelative(PathFragment.create(embeddedPath).getBaseName()); linkTool(sourcePath, linkPath); } |