Automated rollback of commit 4260c30a03a9b83d48a5e8690aca19cd80be4c38.

*** Reason for rollback ***

Try again with fixes.

*** Original change description ***

Automated rollback of commit 10b0d8aa6b73a024cc007c5e075cb329add878ef.

*** Reason for rollback ***

Breaks Google-internal targets, sadly.

*** Original change description ***

Ban middlemen from runfiles artifacts.

Previous changes have removed all middlemen from runfiles
artifacts. This CL locks it down and removes various now-redundant
*WithoutMiddlemen() methods from Runfiles.

I put a check for middlemen in ConflictChecker.put, which should be a
chokepoint for runfiles arti...

***

PiperOrigin-RevId: 184661375

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
index 3d9d547659..b7a420a03e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
@@ -211,7 +211,7 @@ public final class SourceManifestAction extends AbstractFileWriteAction {
       f.addPath(rootSymlink.getValue().getPath());
     }
 
-    for (Artifact artifact : runfiles.getArtifactsWithoutMiddlemen()) {
+    for (Artifact artifact : runfiles.getArtifacts()) {
       f.addPath(artifact.getRootRelativePath());
       f.addPath(artifact.getPath());
     }