Automated rollback of commit 743dc14f9f30b80d6d821612f77186afb025477d.

*** Reason for rollback ***

Rollforward with a fix

*** Original change description ***

Automated rollback of commit 0ee3aa622fc13b8a5072ebddf5cd65823413b4ff.

*** Reason for rollback ***

Likely causing artifact conflicts for middleman artifacts in some cases due to accidental change of getMiddlemanDir() to getBinDir() in RunfilesSupport.createManifestMiddleman.

*** Original change description ***

Cleanup ActionConstructionContext.

Do not expose the underlying Rule.

RELNOTES: None.
PiperOrigin-RevId: 169241011

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
index fddc36e460..f567fcda95 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
@@ -267,7 +267,7 @@ public final class RunfilesSupport {
       Iterable<Artifact> allRunfilesArtifacts) {
     return context.getAnalysisEnvironment().getMiddlemanFactory().createRunfilesMiddleman(
         context.getActionOwner(), owningExecutable, allRunfilesArtifacts,
-        context.getConfiguration().getMiddlemanDirectory(context.getRule().getRepository()),
+        context.getMiddlemanDirectory(),
         "runfiles_artifacts");
   }
 
@@ -276,7 +276,7 @@ public final class RunfilesSupport {
     return context.getAnalysisEnvironment().getMiddlemanFactory().createRunfilesMiddleman(
         context.getActionOwner(), owningExecutable,
         ImmutableList.of(artifactsMiddleman, outputManifest),
-        context.getConfiguration().getMiddlemanDirectory(context.getRule().getRepository()),
+        context.getMiddlemanDirectory(),
         "runfiles");
   }
 
@@ -308,7 +308,7 @@ public final class RunfilesSupport {
 
     BuildConfiguration config = context.getConfiguration();
     Artifact outputManifest = context.getDerivedArtifact(
-        outputManifestPath, config.getBinDirectory(context.getRule().getRepository()));
+        outputManifestPath, context.getBinDirectory());
     context
         .getAnalysisEnvironment()
         .registerAction(
@@ -338,7 +338,7 @@ public final class RunfilesSupport {
     }
     return context.getAnalysisEnvironment().getMiddlemanFactory().createRunfilesMiddleman(
         context.getActionOwner(), owningExecutable, SourceManifestAction.getDependencies(runfiles),
-        context.getConfiguration().getMiddlemanDirectory(context.getRule().getRepository()),
+        context.getMiddlemanDirectory(),
         "runfiles_manifest");
   }
 
@@ -356,7 +356,7 @@ public final class RunfilesSupport {
         executablePath.getBaseName() + ".runfiles.SOURCES");
     Artifact sourceOnlyManifest = context.getDerivedArtifact(
         sourcesManifestPath,
-        context.getConfiguration().getBinDirectory(context.getRule().getRepository()));
+        context.getBinDirectory());
     context.getAnalysisEnvironment().registerAction(SourceManifestAction.forRunfiles(
         ManifestType.SOURCES_ONLY, context.getActionOwner(), sourceOnlyManifest, runfiles));
     return sourceOnlyManifest;