Remove some deadish Windows-related runfiles code.

In particular, SymlinkTreeAction no longer needs to accept artifacts
as an input. --experimental_enable_runfiles now immediately reports an
error on Windows.

This mostly unwinds e4974e4cc6aeb437d36b3b36eb20142b7120fb16
("Separate runfiles middlemen into two layers") and
41f4456ac2348bef66739194853a1ddadcbb887e ("Make runfiles tree creation
on Windows depend on the artifacts of the actual runfiles."). See
https://groups.google.com/d/msg/bazel-dev/btOAgxv434g/bDhTOOePAgAJ.

Change-Id: Iac3308669bfc07abfd1c91445922269d8fdc2a26
PiperOrigin-RevId: 177837504

4 files changed, 12 insertions, 36 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 75f0a1d9c0..acc30fa783 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
@@ -122,7 +122,7 @@ public final class RunfilesSupport {
     Artifact artifactsMiddleman = createArtifactsMiddleman(ruleContext, runfiles.getAllArtifacts());
     if (createManifest) {
       runfilesInputManifest = createRunfilesInputManifestArtifact(ruleContext);
-      runfilesManifest = createRunfilesAction(ruleContext, runfiles, artifactsMiddleman);
+      runfilesManifest = createRunfilesAction(ruleContext, runfiles);
     } else {
       runfilesInputManifest = runfilesManifest =
           createManifestMiddleman(ruleContext, runfiles, artifactsMiddleman);
@@ -282,16 +282,14 @@ public final class RunfilesSupport {
   }
 
   /**
-   * Creates a runfiles action for all of the specified files, and returns the
-   * output artifact (the artifact for the MANIFEST file).
+   * Creates a runfiles action for all of the specified files, and returns the output artifact (the
+   * artifact for the MANIFEST file).
    *
-   * <p>The "runfiles" action creates a symlink farm that links all the runfiles
-   * (which may come from different places, e.g. different package paths,
-   * generated files, etc.) into a single tree, so that programs can access them
-   * using the workspace-relative name.
+   * <p>The "runfiles" action creates a symlink farm that links all the runfiles (which may come
+   * from different places, e.g. different package paths, generated files, etc.) into a single tree,
+   * so that programs can access them using the workspace-relative name.
    */
-  private Artifact createRunfilesAction(ActionConstructionContext context, Runfiles runfiles,
-      Artifact artifactsMiddleman) {
+  private Artifact createRunfilesAction(ActionConstructionContext context, Runfiles runfiles) {
     // Compute the names of the runfiles directory and its MANIFEST file.
     Artifact inputManifest = getRunfilesInputManifest();
     context.getAnalysisEnvironment().registerAction(
@@ -316,7 +314,6 @@ public final class RunfilesSupport {
             new SymlinkTreeAction(
                 context.getActionOwner(),
                 inputManifest,
-                artifactsMiddleman,
                 outputManifest,
                 /*filesetTree=*/ false,
                 config.getLocalShellEnvironment(),
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
index d0600db0a8..3b2750df5a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
@@ -25,8 +25,6 @@ import com.google.devtools.build.lib.actions.ActionResult;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.util.Fingerprint;
-import com.google.devtools.build.lib.vfs.Path;
-import javax.annotation.Nullable;
 
 /**
  * Action responsible for the symlink tree creation.
@@ -47,9 +45,6 @@ public final class SymlinkTreeAction extends AbstractAction {
    * Creates SymlinkTreeAction instance.
    *  @param owner action owner
    * @param inputManifest the input runfiles manifest
-   * @param artifactMiddleman the middleman artifact representing all the files the symlinks
-   *                          point to (on Windows we need to know if the target of a "symlink" is
-   *                          a directory or a file so we need to build it before)
    * @param outputManifest the generated symlink tree manifest
    *                       (must have "MANIFEST" base name). Symlink tree root
    *                       will be set to the artifact's parent directory.
@@ -59,12 +54,11 @@ public final class SymlinkTreeAction extends AbstractAction {
   public SymlinkTreeAction(
       ActionOwner owner,
       Artifact inputManifest,
-      @Nullable Artifact artifactMiddleman,
       Artifact outputManifest,
       boolean filesetTree,
       ImmutableMap<String, String> shellEnvironment,
       boolean enableRunfiles) {
-    super(owner, computeInputs(inputManifest, artifactMiddleman), ImmutableList.of(outputManifest));
+    super(owner, ImmutableList.of(inputManifest), ImmutableList.of(outputManifest));
     Preconditions.checkArgument(outputManifest.getPath().getBaseName().equals("MANIFEST"));
     this.inputManifest = inputManifest;
     this.outputManifest = outputManifest;
@@ -73,19 +67,6 @@ public final class SymlinkTreeAction extends AbstractAction {
     this.enableRunfiles = enableRunfiles;
   }
 
-  private static ImmutableList<Artifact> computeInputs(
-      Artifact inputManifest, Artifact artifactMiddleman) {
-    ImmutableList.Builder<Artifact> result = ImmutableList.<Artifact>builder()
-        .add(inputManifest);
-    if (artifactMiddleman != null) {
-      Path path = artifactMiddleman.getPath();
-      if (!path.getFileSystem().supportsSymbolicLinksNatively(path)) {
-        result.add(artifactMiddleman);
-      }
-    }
-    return result.build();
-  }
-
   public Artifact getInputManifest() {
     return inputManifest;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index 23094fb938..6130a0d8f6 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -1274,6 +1274,10 @@ public class BuildConfiguration implements BuildEvent {
       fragment.reportInvalidOptions(reporter, this.buildOptions);
     }
 
+    if (OS.getCurrent() == OS.WINDOWS && runfilesEnabled()) {
+      reporter.handle(Event.error("building runfiles is not supported on Windows"));
+    }
+
     if (options.outputDirectoryName != null) {
       reporter.handle(Event.error(
           "The internal '--output directory name' option cannot be used on the command line"));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java b/src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java
index 44e395f526..aa70cf7887 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java
@@ -159,17 +159,11 @@ public final class NativeLibs {
             .build();
     ruleContext.registerAction(sourceManifestAction);
     Artifact outputManifest = AndroidBinary.getDxArtifact(ruleContext, "native_symlinks/MANIFEST");
-    Artifact nativeLibsMiddleman =
-        ruleContext.getAnalysisEnvironment().getMiddlemanFactory().createRunfilesMiddleman(
-            ruleContext.getActionOwner(), null, symlinks.values(),
-            ruleContext.getConfiguration().getMiddlemanDirectory(
-                ruleContext.getRule().getRepository()), "android_native_libs");
 
     ruleContext.registerAction(
         new SymlinkTreeAction(
             ruleContext.getActionOwner(),
             inputManifest,
-            nativeLibsMiddleman,
             outputManifest,
             false,
             ruleContext.getConfiguration().getLocalShellEnvironment(),