Remove Artifact#getOutputDirRelativePathString.
* StarlarkActionFactory
- It's part of a progress message. getExecPathString serves the purpose well enough.
* AndroidBinaryTest
- This test doesn't deal with external repository artifacts, so it can be replaced with getRepositoryRelativePathString.
* BazelJavaSemantics
- Given the path strings are prefixed with a workspace name, getRepositoryRelativePathString is the right method to use.
PiperOrigin-RevId: 337093765
diff --git a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
index a2d96af..07f1f3f 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
@@ -678,10 +678,6 @@
return getRootRelativePath().getPathString();
}
- public final String getOutputDirRelativePathString() {
- return getOutputDirRelativePath().getPathString();
- }
-
public final String getRepositoryRelativePathString() {
return getRepositoryRelativePath().getPathString();
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java
index d32d8b1..1632978 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java
@@ -234,7 +234,7 @@
String progressMessage =
(progressMessageUnchecked != Starlark.NONE)
? (String) progressMessageUnchecked
- : "Creating symlink " + outputArtifact.getOutputDirRelativePathString();
+ : "Creating symlink " + outputArtifact.getExecPathString();
SymlinkAction action;
if (targetFile != Starlark.NONE) {
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
index 541763a..d0ea04b 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
@@ -337,7 +337,7 @@
+ "\nexport TEST_RUNTIME_CLASSPATH_FILE=${JAVA_RUNFILES}"
+ File.separator
+ workspacePrefix
- + testRuntimeClasspathArtifact.getOutputDirRelativePathString()));
+ + testRuntimeClasspathArtifact.getRepositoryRelativePathString()));
} else {
arguments.add(
new ComputedClasspathSubstitution(classpath, workspacePrefix, isRunfilesEnabled));
@@ -365,7 +365,7 @@
"export JACOCO_METADATA_JAR=${JAVA_RUNFILES}/"
+ workspacePrefix
+ "/"
- + runtimeClassPathArtifact.getOutputDirRelativePathString()));
+ + runtimeClassPathArtifact.getRepositoryRelativePathString()));
} else {
// Remove the placeholder in the stub otherwise bazel coverage fails.
arguments.add(Substitution.of(JavaSemantics.JACOCO_METADATA_PLACEHOLDER, ""));
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 119da37..4aeb629 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -1400,7 +1400,7 @@
.getExecutable();
assertWithMessage("ProGuard implementation was not correctly taken from the configuration")
.that(proguardAction.getCommandFilename())
- .endsWith(jkrunchyExecutable.getOutputDirRelativePathString());
+ .endsWith(jkrunchyExecutable.getRepositoryRelativePathString());
}
@Test
